Skip to content

Commit 7c07a86

Browse files
derekmaurocopybara-github
authored andcommitted
Update CI builds to use Bazel 7.0.0
--features=external_include_paths has been removed from Windows builds since it appears cause build command errors currently PiperOrigin-RevId: 597020418 Change-Id: Ie37be0d05f3a154ab0d3c3f7d39b4e2c0ed650a3
1 parent 7f409cb commit 7c07a86

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

ci/linux-presubmit.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
set -euox pipefail
3333

34-
readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20230816"
34+
readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20231218"
3535
readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20230120"
3636

3737
if [[ -z ${GTEST_ROOT:-} ]]; then
@@ -80,7 +80,6 @@ time docker run \
8080
--copt="-Wuninitialized" \
8181
--copt="-Wundef" \
8282
--copt="-Wno-error=pragmas" \
83-
--distdir="/bazel-distdir" \
8483
--features=external_include_paths \
8584
--keep_going \
8685
--show_timestamps \
@@ -102,7 +101,7 @@ for std in ${STD}; do
102101
--copt="-Wuninitialized" \
103102
--copt="-Wundef" \
104103
--define="absl=${absl}" \
105-
--distdir="/bazel-distdir" \
104+
--enable_bzlmod=false \
106105
--features=external_include_paths \
107106
--keep_going \
108107
--show_timestamps \
@@ -127,7 +126,7 @@ for std in ${STD}; do
127126
--copt="-Wuninitialized" \
128127
--copt="-Wundef" \
129128
--define="absl=${absl}" \
130-
--distdir="/bazel-distdir" \
129+
--enable_bzlmod=false \
131130
--features=external_include_paths \
132131
--keep_going \
133132
--linkopt="--gcc-toolchain=/usr/local" \

ci/macos-presubmit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ done
5353
# Test the Bazel build
5454

5555
# If we are running on Kokoro, check for a versioned Bazel binary.
56-
KOKORO_GFILE_BAZEL_BIN="bazel-5.1.1-darwin-x86_64"
56+
KOKORO_GFILE_BAZEL_BIN="bazel-7.0.0-darwin-x86_64"
5757
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then
5858
BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}"
5959
chmod +x ${BAZEL_BIN}

ci/windows-presubmit.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SETLOCAL ENABLEDELAYEDEXPANSION
22

3-
SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-5.1.1-windows-x86_64.exe
3+
SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-7.0.0-windows-x86_64.exe
44

55
SET PATH=C:\Python34;%PATH%
66
SET BAZEL_PYTHON=C:\python34\python.exe
@@ -51,7 +51,6 @@ SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community
5151
--compilation_mode=dbg ^
5252
--copt=/std:c++14 ^
5353
--copt=/WX ^
54-
--features=external_include_paths ^
5554
--keep_going ^
5655
--test_output=errors ^
5756
--test_tag_filters=-no_test_msvc2017

0 commit comments

Comments
 (0)