mirror of https://github.com/bazelbuild/rules_pkg
Don't load cc toolchain from rules_cc (#779)
* Don't load cc toolchain from rules_cc The cc toolchain autoconfig is out of sync from Bazel and doesn't work with VS2022. Related: https://github.com/bazelbuild/continuous-integration/pull/1770 * Fixes centos7
This commit is contained in:
parent
3b095c64a6
commit
e97d155ebe
|
@ -5,7 +5,7 @@ common: &common
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
centos7:
|
centos7:
|
||||||
platform: centos7
|
platform: centos7_java11_devtoolset10
|
||||||
<<: *common
|
<<: *common
|
||||||
ubuntu1804:
|
ubuntu1804:
|
||||||
platform: ubuntu1804
|
platform: ubuntu1804
|
||||||
|
|
|
@ -5,7 +5,7 @@ common: &common
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
centos7:
|
centos7:
|
||||||
platform: centos7
|
platform: centos7_java11_devtoolset10
|
||||||
<<: *common
|
<<: *common
|
||||||
ubuntu1804:
|
ubuntu1804:
|
||||||
platform: ubuntu1804
|
platform: ubuntu1804
|
||||||
|
|
|
@ -5,7 +5,7 @@ common: &common
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
centos7:
|
centos7:
|
||||||
platform: centos7
|
platform: centos7_java11_devtoolset10
|
||||||
<<: *common
|
<<: *common
|
||||||
ubuntu1804:
|
ubuntu1804:
|
||||||
platform: ubuntu1804
|
platform: ubuntu1804
|
||||||
|
|
|
@ -67,7 +67,7 @@ ubuntu1804: &ubuntu
|
||||||
- "//doc_build:*"
|
- "//doc_build:*"
|
||||||
|
|
||||||
centos7: ¢os
|
centos7: ¢os
|
||||||
platform: centos7
|
platform: centos7_java11_devtoolset10
|
||||||
<<: *common
|
<<: *common
|
||||||
<<: *default_tests_with_rpm
|
<<: *default_tests_with_rpm
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ build_targets: &build_targets
|
||||||
- '-@rules_pkg//pkg:make_rpm'
|
- '-@rules_pkg//pkg:make_rpm'
|
||||||
|
|
||||||
platforms:
|
platforms:
|
||||||
centos7:
|
centos7_java11_devtoolset10:
|
||||||
build_targets: *build_targets
|
build_targets: *build_targets
|
||||||
debian10:
|
debian10:
|
||||||
build_targets: *build_targets
|
build_targets: *build_targets
|
||||||
|
|
|
@ -79,8 +79,6 @@ http_archive(
|
||||||
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"],
|
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"],
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
|
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies")
|
||||||
|
|
||||||
rules_cc_dependencies()
|
rules_cc_dependencies()
|
||||||
|
|
||||||
rules_cc_toolchains()
|
|
||||||
|
|
|
@ -32,8 +32,6 @@ http_archive(
|
||||||
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"],
|
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz"],
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
|
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies")
|
||||||
|
|
||||||
rules_cc_dependencies()
|
rules_cc_dependencies()
|
||||||
|
|
||||||
rules_cc_toolchains()
|
|
||||||
|
|
Loading…
Reference in New Issue