diff options
| author | Derek Mauro <dmauro@google.com> | 2024-01-09 09:57:27 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2024-01-09 09:58:40 -0800 |
| commit | 19599937197b3506c3bdd2e81dc185141b6f436c (patch) | |
| tree | 925fc01c4949269f1155f4701d3cecb13c129d9e /ci/macos_xcode_bazel.sh | |
| parent | 6d21df714aa6a2ab2fc4029ca71dcff2daa03ca1 (diff) | |
| download | abseil-19599937197b3506c3bdd2e81dc185141b6f436c.tar.gz abseil-19599937197b3506c3bdd2e81dc185141b6f436c.tar.bz2 abseil-19599937197b3506c3bdd2e81dc185141b6f436c.zip | |
Update Windows and MacOS CI builds to Bazel 7.0.0
This changes the way in which clang-cl is selected on Windows
as it has changed:
https://bazel.build/configure/windows#clang
--features=external_include_paths has been removed from Windows builds
since it appears cause build command errors currently
PiperOrigin-RevId: 596965732
Change-Id: I95b636a9a4fdcc4172c3bb8c6cb28d5f7db592c9
Diffstat (limited to 'ci/macos_xcode_bazel.sh')
| -rwxr-xr-x | ci/macos_xcode_bazel.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/macos_xcode_bazel.sh b/ci/macos_xcode_bazel.sh index 04c9a1a2..460f94da 100755 --- a/ci/macos_xcode_bazel.sh +++ b/ci/macos_xcode_bazel.sh @@ -24,7 +24,7 @@ if [[ -z ${ABSEIL_ROOT:-} ]]; then fi # If we are running on Kokoro, check for a versioned Bazel binary. -KOKORO_GFILE_BAZEL_BIN="bazel-5.1.1-darwin-x86_64" +KOKORO_GFILE_BAZEL_BIN="bazel-7.0.0-darwin-x86_64" if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}" chmod +x ${BAZEL_BIN} @@ -56,6 +56,7 @@ ${BAZEL_BIN} test ... \ --copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \ --copt="-Werror" \ --cxxopt="-std=c++14" \ + --enable_bzlmod=false \ --features=external_include_paths \ --keep_going \ --show_timestamps \ |