bazel
/
rules_pkg
mirror of https://github.com/bazelbuild/rules_pkg
2
0
Fork 0
Code Issues Releases Activity

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:
Yun Peng 2023-11-07 17:28:30 +01:00 committed by GitHub
parent 3b095c64a6
commit e97d155ebe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bazelci/examples_naming.yml
View File

@ -5,7 +5,7 @@ common: &common
tasks: tasks:
centos7: centos7:
platform: centos7 platform: centos7_java11_devtoolset10
<<: *common <<: *common
ubuntu1804: ubuntu1804:
platform: ubuntu1804 platform: ubuntu1804

2
.bazelci/examples_rich_structure.yml
View File

@ -5,7 +5,7 @@ common: &common
tasks: tasks:
centos7: centos7:
platform: centos7 platform: centos7_java11_devtoolset10
<<: *common <<: *common
ubuntu1804: ubuntu1804:
platform: ubuntu1804 platform: ubuntu1804

2
.bazelci/examples_stamping.yml
View File

@ -5,7 +5,7 @@ common: &common
tasks: tasks:
centos7: centos7:
platform: centos7 platform: centos7_java11_devtoolset10
<<: *common <<: *common
ubuntu1804: ubuntu1804:
platform: ubuntu1804 platform: ubuntu1804

2
.bazelci/tests.yml
View File

@ -67,7 +67,7 @@ ubuntu1804: &ubuntu
- "//doc_build:*" - "//doc_build:*"
centos7: &centos centos7: &centos
platform: centos7 platform: centos7_java11_devtoolset10
<<: *common <<: *common
<<: *default_tests_with_rpm <<: *default_tests_with_rpm

2
.bcr/presubmit.yml
View File

@ -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

4
WORKSPACE
View File

@ -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()

4
examples/rich_structure/WORKSPACE
View File

@ -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()