Skip to content

Commit cdd3d21

Browse files
derekmaurocopybara-github
derekmauro
authored and
copybara-github
committed
Linux CI update
GCC latest is now GCC-15.1 Clang on ARM is now Clang-19 Bazel 8.2.1 CMake 4.0.1 Enable Bazel "Vendor Mode" as a caching mechanism to reduce GitHub download failures. PiperOrigin-RevId: 755864516 Change-Id: I9bf38e20fb8a09739406798119c50ce1aa934f43
1 parent 668f174 commit cdd3d21

10 files changed

+105
-101
lines changed

‎ci/cmake_common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414

1515
# The commit of GoogleTest to be used in the CMake tests in this directory.
1616
# Keep this in sync with the commit in the MODULE.bazel file.
17-
readonly ABSL_GOOGLETEST_VERSION="1.16.0"
17+
readonly ABSL_GOOGLETEST_VERSION="1.17.0"
1818

1919
readonly ABSL_GOOGLETEST_DOWNLOAD_URL="https://github.com/google/googletest/releases/download/v${ABSL_GOOGLETEST_VERSION}/googletest-${ABSL_GOOGLETEST_VERSION}.tar.gz"

‎ci/linux_arm_clang-latest_libcxx_bazel.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ if [[ ${USE_BAZEL_CACHE:-0} -ne 0 ]]; then
5151
BAZEL_EXTRA_ARGS="--remote_cache=https://storage.googleapis.com/absl-bazel-remote-cache/${container_key} --google_credentials=/keystore/73103_absl-bazel-remote-cache ${BAZEL_EXTRA_ARGS:-}"
5252
fi
5353

54-
# Avoid depending on external sites like GitHub by checking --distdir for
55-
# external dependencies first.
56-
# https://docs.bazel.build/versions/master/guide.html#distdir
57-
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -d "${KOKORO_GFILE_DIR}/distdir" ]]; then
58-
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly ${DOCKER_EXTRA_ARGS:-}"
59-
BAZEL_EXTRA_ARGS="--distdir=/distdir ${BAZEL_EXTRA_ARGS:-}"
54+
# Use Bazel Vendor mode to reduce reliance on external dependencies.
55+
# See https://bazel.build/external/vendor and the Dockerfile for
56+
# an explaination of how this works.
57+
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f "${KOKORO_GFILE_DIR}/distdir/abseil-cpp_vendor.tar.gz" ]]; then
58+
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly --env=BAZEL_VENDOR_ARCHIVE=/distdir/abseil-cpp_vendor.tar.gz ${DOCKER_EXTRA_ARGS:-}"
59+
BAZEL_EXTRA_ARGS="--vendor_dir=/abseil-cpp_vendor ${BAZEL_EXTRA_ARGS:-}"
6060
fi
6161

6262
for std in ${STD}; do
@@ -71,13 +71,13 @@ for std in ${STD}; do
7171
--rm \
7272
${DOCKER_EXTRA_ARGS:-} \
7373
${DOCKER_CONTAINER} \
74-
/bin/sh -c "
74+
/bin/bash --login -c "
7575
cp -r /abseil-cpp-ro/* /abseil-cpp/
7676
if [ -n \"${ALTERNATE_OPTIONS:-}\" ]; then
7777
cp ${ALTERNATE_OPTIONS:-} absl/base/options.h || exit 1
7878
fi
7979
/usr/local/bin/bazel test ... \
80-
--action_env=CC=clang-18 \
80+
--action_env=CC=clang-19 \
8181
--compilation_mode=\"${compilation_mode}\" \
8282
--copt=\"${exceptions_mode}\" \
8383
--copt=\"-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1\" \

‎ci/linux_clang-latest_libcxx_asan_bazel.sh‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,32 +73,33 @@ for std in ${STD}; do
7373
--rm \
7474
${DOCKER_EXTRA_ARGS:-} \
7575
${DOCKER_CONTAINER} \
76+
/bin/bash --login -c "
7677
/usr/local/bin/bazel test ... \
77-
--action_env="CC=/opt/llvm/clang/bin/clang" \
78-
--action_env="BAZEL_CXXOPTS=-std=${std}:-nostdinc++" \
79-
--action_env="BAZEL_LINKOPTS=-L/opt/llvm/libcxx/lib:-lc++:-lc++abi:-lm:-Wl,-rpath=/opt/llvm/libcxx/lib" \
80-
--action_env="CPLUS_INCLUDE_PATH=/opt/llvm/libcxx/include/c++/v1" \
81-
--compilation_mode="${compilation_mode}" \
82-
--copt="${exceptions_mode}" \
83-
--copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \
84-
--copt="-fsanitize=address" \
85-
--copt="-fsanitize=${UBSAN_CHECKS}" \
86-
--copt="-fno-sanitize-recover=${UBSAN_CHECKS}" \
87-
--copt="-fno-sanitize-blacklist" \
78+
--action_env=\"CC=/opt/llvm/clang/bin/clang\" \
79+
--action_env=\"BAZEL_CXXOPTS=-std=${std}:-nostdinc++\" \
80+
--action_env=\"BAZEL_LINKOPTS=-L/opt/llvm/libcxx/lib:-lc++:-lc++abi:-lm:-Wl,-rpath=/opt/llvm/libcxx/lib\" \
81+
--action_env=\"CPLUS_INCLUDE_PATH=/opt/llvm/libcxx/include/c++/v1\" \
82+
--compilation_mode=\"${compilation_mode}\" \
83+
--copt=\"${exceptions_mode}\" \
84+
--copt=\"-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1\" \
85+
--copt=\"-fsanitize=address\" \
86+
--copt=\"-fsanitize=${UBSAN_CHECKS}\" \
87+
--copt=\"-fno-sanitize-recover=${UBSAN_CHECKS}\" \
88+
--copt=\"-fno-sanitize-blacklist\" \
8889
--copt=-Werror \
8990
--enable_bzlmod=true \
9091
--features=external_include_paths \
9192
--keep_going \
92-
--linkopt="-fsanitize=address" \
93-
--linkopt="-fsanitize-link-c++-runtime" \
93+
--linkopt=\"-fsanitize=address\" \
94+
--linkopt=\"-fsanitize-link-c++-runtime\" \
9495
--show_timestamps \
95-
--test_env="ASAN_SYMBOLIZER_PATH=/opt/llvm/clang/bin/llvm-symbolizer" \
96-
--test_env="TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo" \
97-
--test_env="UBSAN_OPTIONS=print_stacktrace=1" \
98-
--test_env="UBSAN_SYMBOLIZER_PATH=/opt/llvm/clang/bin/llvm-symbolizer" \
96+
--test_env=\"ASAN_SYMBOLIZER_PATH=/opt/llvm/clang/bin/llvm-symbolizer\" \
97+
--test_env=\"TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo\" \
98+
--test_env=\"UBSAN_OPTIONS=print_stacktrace=1\" \
99+
--test_env=\"UBSAN_SYMBOLIZER_PATH=/opt/llvm/clang/bin/llvm-symbolizer\" \
99100
--test_output=errors \
100-
--test_tag_filters="-benchmark,-noasan" \
101-
${BAZEL_EXTRA_ARGS:-}
101+
--test_tag_filters=\"-benchmark,-noasan\" \
102+
${BAZEL_EXTRA_ARGS:-}"
102103
done
103104
done
104105
done

‎ci/linux_clang-latest_libcxx_bazel.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ if [[ ${USE_BAZEL_CACHE:-0} -ne 0 ]]; then
5151
BAZEL_EXTRA_ARGS="--remote_cache=https://storage.googleapis.com/absl-bazel-remote-cache/${container_key} --google_credentials=/keystore/73103_absl-bazel-remote-cache ${BAZEL_EXTRA_ARGS:-}"
5252
fi
5353

54-
# Avoid depending on external sites like GitHub by checking --distdir for
55-
# external dependencies first.
56-
# https://docs.bazel.build/versions/master/guide.html#distdir
57-
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -d "${KOKORO_GFILE_DIR}/distdir" ]]; then
58-
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly ${DOCKER_EXTRA_ARGS:-}"
59-
BAZEL_EXTRA_ARGS="--distdir=/distdir ${BAZEL_EXTRA_ARGS:-}"
54+
# Use Bazel Vendor mode to reduce reliance on external dependencies.
55+
# See https://bazel.build/external/vendor and the Dockerfile for
56+
# an explaination of how this works.
57+
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f "${KOKORO_GFILE_DIR}/distdir/abseil-cpp_vendor.tar.gz" ]]; then
58+
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly --env=BAZEL_VENDOR_ARCHIVE=/distdir/abseil-cpp_vendor.tar.gz ${DOCKER_EXTRA_ARGS:-}"
59+
BAZEL_EXTRA_ARGS="--vendor_dir=/abseil-cpp_vendor ${BAZEL_EXTRA_ARGS:-}"
6060
fi
6161

6262
for std in ${STD}; do
@@ -71,7 +71,7 @@ for std in ${STD}; do
7171
--rm \
7272
${DOCKER_EXTRA_ARGS:-} \
7373
${DOCKER_CONTAINER} \
74-
/bin/sh -c "
74+
/bin/bash --login -c "
7575
cp -r /abseil-cpp-ro/* /abseil-cpp/
7676
if [ -n \"${ALTERNATE_OPTIONS:-}\" ]; then
7777
cp ${ALTERNATE_OPTIONS:-} absl/base/options.h || exit 1

‎ci/linux_clang-latest_libcxx_tsan_bazel.sh‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ if [[ ${USE_BAZEL_CACHE:-0} -ne 0 ]]; then
5151
BAZEL_EXTRA_ARGS="--remote_cache=https://storage.googleapis.com/absl-bazel-remote-cache/${container_key} --google_credentials=/keystore/73103_absl-bazel-remote-cache ${BAZEL_EXTRA_ARGS:-}"
5252
fi
5353

54-
# Avoid depending on external sites like GitHub by checking --distdir for
55-
# external dependencies first.
56-
# https://docs.bazel.build/versions/master/guide.html#distdir
57-
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -d "${KOKORO_GFILE_DIR}/distdir" ]]; then
58-
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly ${DOCKER_EXTRA_ARGS:-}"
59-
BAZEL_EXTRA_ARGS="--distdir=/distdir ${BAZEL_EXTRA_ARGS:-}"
54+
# Use Bazel Vendor mode to reduce reliance on external dependencies.
55+
# See https://bazel.build/external/vendor and the Dockerfile for
56+
# an explaination of how this works.
57+
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f "${KOKORO_GFILE_DIR}/distdir/abseil-cpp_vendor.tar.gz" ]]; then
58+
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly --env=BAZEL_VENDOR_ARCHIVE=/distdir/abseil-cpp_vendor.tar.gz ${DOCKER_EXTRA_ARGS:-}"
59+
BAZEL_EXTRA_ARGS="--vendor_dir=/abseil-cpp_vendor ${BAZEL_EXTRA_ARGS:-}"
6060
fi
6161

6262
for std in ${STD}; do
@@ -70,28 +70,29 @@ for std in ${STD}; do
7070
--rm \
7171
${DOCKER_EXTRA_ARGS:-} \
7272
${DOCKER_CONTAINER} \
73+
/bin/bash --login -c "
7374
/usr/local/bin/bazel test ... \
74-
--action_env="CC=/opt/llvm/clang/bin/clang" \
75-
--action_env="BAZEL_CXXOPTS=-std=${std}:-nostdinc++" \
76-
--action_env="BAZEL_LINKOPTS=-L/opt/llvm/libcxx-tsan/lib:-lc++:-lc++abi:-lm:-Wl,-rpath=/opt/llvm/libcxx-tsan/lib" \
77-
--action_env="CPLUS_INCLUDE_PATH=/opt/llvm/libcxx-tsan/include/c++/v1" \
78-
--build_tag_filters="-notsan" \
79-
--compilation_mode="${compilation_mode}" \
80-
--copt="${exceptions_mode}" \
81-
--copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \
82-
--copt="-fsanitize=thread" \
83-
--copt="-fno-sanitize-blacklist" \
75+
--action_env=\"CC=/opt/llvm/clang/bin/clang\" \
76+
--action_env=\"BAZEL_CXXOPTS=-std=${std}:-nostdinc++\" \
77+
--action_env=\"BAZEL_LINKOPTS=-L/opt/llvm/libcxx-tsan/lib:-lc++:-lc++abi:-lm:-Wl,-rpath=/opt/llvm/libcxx-tsan/lib\" \
78+
--action_env=\"CPLUS_INCLUDE_PATH=/opt/llvm/libcxx-tsan/include/c++/v1\" \
79+
--build_tag_filters=\"-notsan\" \
80+
--compilation_mode=\"${compilation_mode}\" \
81+
--copt=\"${exceptions_mode}\" \
82+
--copt=\"-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1\" \
83+
--copt=\"-fsanitize=thread\" \
84+
--copt=\"-fno-sanitize-blacklist\" \
8485
--copt=-Werror \
8586
--enable_bzlmod=true \
8687
--features=external_include_paths \
8788
--keep_going \
88-
--linkopt="-fsanitize=thread" \
89+
--linkopt=\"-fsanitize=thread\" \
8990
--show_timestamps \
90-
--test_env="TSAN_SYMBOLIZER_PATH=/opt/llvm/clang/bin/llvm-symbolizer" \
91-
--test_env="TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo" \
91+
--test_env=\"TSAN_SYMBOLIZER_PATH=/opt/llvm/clang/bin/llvm-symbolizer\" \
92+
--test_env=\"TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo\" \
9293
--test_output=errors \
93-
--test_tag_filters="-benchmark,-notsan" \
94-
${BAZEL_EXTRA_ARGS:-}
94+
--test_tag_filters=\"-benchmark,-notsan\" \
95+
${BAZEL_EXTRA_ARGS:-}"
9596
done
9697
done
9798
done

‎ci/linux_clang-latest_libstdcxx_bazel.sh‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ if [[ ${USE_BAZEL_CACHE:-0} -ne 0 ]]; then
5151
BAZEL_EXTRA_ARGS="--remote_cache=https://storage.googleapis.com/absl-bazel-remote-cache/${container_key} --google_credentials=/keystore/73103_absl-bazel-remote-cache ${BAZEL_EXTRA_ARGS:-}"
5252
fi
5353

54-
# Avoid depending on external sites like GitHub by checking --distdir for
55-
# external dependencies first.
56-
# https://docs.bazel.build/versions/master/guide.html#distdir
57-
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -d "${KOKORO_GFILE_DIR}/distdir" ]]; then
58-
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly ${DOCKER_EXTRA_ARGS:-}"
59-
BAZEL_EXTRA_ARGS="--distdir=/distdir ${BAZEL_EXTRA_ARGS:-}"
54+
# Use Bazel Vendor mode to reduce reliance on external dependencies.
55+
# See https://bazel.build/external/vendor and the Dockerfile for
56+
# an explaination of how this works.
57+
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f "${KOKORO_GFILE_DIR}/distdir/abseil-cpp_vendor.tar.gz" ]]; then
58+
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly --env=BAZEL_VENDOR_ARCHIVE=/distdir/abseil-cpp_vendor.tar.gz ${DOCKER_EXTRA_ARGS:-}"
59+
BAZEL_EXTRA_ARGS="--vendor_dir=/abseil-cpp_vendor ${BAZEL_EXTRA_ARGS:-}"
6060
fi
6161

6262
for std in ${STD}; do
@@ -70,26 +70,27 @@ for std in ${STD}; do
7070
--rm \
7171
${DOCKER_EXTRA_ARGS:-} \
7272
${DOCKER_CONTAINER} \
73+
/bin/bash --login -c "
7374
/usr/local/bin/bazel test ... \
74-
--action_env="CC=/opt/llvm/clang/bin/clang" \
75-
--action_env="BAZEL_CXXOPTS=-std=${std}" \
76-
--compilation_mode="${compilation_mode}" \
77-
--copt="--gcc-toolchain=/usr/local" \
78-
--copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \
79-
--copt="${exceptions_mode}" \
80-
--copt="-march=haswell" \
75+
--action_env=\"CC=/opt/llvm/clang/bin/clang\" \
76+
--action_env=\"BAZEL_CXXOPTS=-std=${std}\" \
77+
--compilation_mode=\"${compilation_mode}\" \
78+
--copt=\"--gcc-toolchain=/usr/local\" \
79+
--copt=\"-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1\" \
80+
--copt=\"${exceptions_mode}\" \
81+
--copt=\"-march=haswell\" \
8182
--copt=-Werror \
82-
--define="absl=1" \
83+
--define=\"absl=1\" \
8384
--enable_bzlmod=true \
8485
--features=external_include_paths \
8586
--keep_going \
86-
--linkopt="--gcc-toolchain=/usr/local" \
87+
--linkopt=\"--gcc-toolchain=/usr/local\" \
8788
--show_timestamps \
88-
--test_env="GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1" \
89-
--test_env="TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo" \
89+
--test_env=\"GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1\" \
90+
--test_env=\"TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo\" \
9091
--test_output=errors \
9192
--test_tag_filters=-benchmark \
92-
${BAZEL_EXTRA_ARGS:-}
93+
${BAZEL_EXTRA_ARGS:-}"
9394
done
9495
done
9596
done

‎ci/linux_docker_containers.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Test scripts should source this file to get the identifiers.
1717

1818
readonly LINUX_ALPINE_CONTAINER="gcr.io/google.com/absl-177019/alpine:20230612"
19-
readonly LINUX_CLANG_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20241218"
20-
readonly LINUX_ARM_CLANG_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_arm_hybrid-latest:20250224"
21-
readonly LINUX_GCC_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20241218"
22-
readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20250205"
19+
readonly LINUX_CLANG_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20250430"
20+
readonly LINUX_ARM_CLANG_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_arm_hybrid-latest:20250430"
21+
readonly LINUX_GCC_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20250430"
22+
readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20250430"

‎ci/linux_gcc-floor_libstdcxx_bazel.sh‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ if [[ ${USE_BAZEL_CACHE:-0} -ne 0 ]]; then
5151
BAZEL_EXTRA_ARGS="--remote_http_cache=https://storage.googleapis.com/absl-bazel-remote-cache/${container_key} --google_credentials=/keystore/73103_absl-bazel-remote-cache ${BAZEL_EXTRA_ARGS:-}"
5252
fi
5353

54-
# Avoid depending on external sites like GitHub by checking --distdir for
55-
# external dependencies first.
56-
# https://docs.bazel.build/versions/master/guide.html#distdir
57-
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -d "${KOKORO_GFILE_DIR}/distdir" ]]; then
58-
DOCKER_EXTRA_ARGS="--volume=${KOKORO_GFILE_DIR}/distdir:/distdir:ro ${DOCKER_EXTRA_ARGS:-}"
59-
BAZEL_EXTRA_ARGS="--distdir=/distdir ${BAZEL_EXTRA_ARGS:-}"
54+
# Use Bazel Vendor mode to reduce reliance on external dependencies.
55+
# See https://bazel.build/external/vendor and the Dockerfile for
56+
# an explaination of how this works.
57+
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f "${KOKORO_GFILE_DIR}/distdir/abseil-cpp_vendor.tar.gz" ]]; then
58+
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly --env=BAZEL_VENDOR_ARCHIVE=/distdir/abseil-cpp_vendor.tar.gz ${DOCKER_EXTRA_ARGS:-}"
59+
BAZEL_EXTRA_ARGS="--vendor_dir=/abseil-cpp_vendor ${BAZEL_EXTRA_ARGS:-}"
6060
fi
6161

6262
for std in ${STD}; do
@@ -70,22 +70,23 @@ for std in ${STD}; do
7070
--rm \
7171
${DOCKER_EXTRA_ARGS:-} \
7272
${DOCKER_CONTAINER} \
73+
/bin/bash --login -c "
7374
/usr/local/bin/bazel test ... \
74-
--action_env="CC=/usr/local/bin/gcc" \
75-
--action_env="BAZEL_CXXOPTS=-std=${std}" \
76-
--compilation_mode="${compilation_mode}" \
77-
--copt="${exceptions_mode}" \
78-
--copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \
75+
--action_env=\"CC=/usr/local/bin/gcc\" \
76+
--action_env=\"BAZEL_CXXOPTS=-std=${std}\" \
77+
--compilation_mode=\"${compilation_mode}\" \
78+
--copt=\"${exceptions_mode}\" \
79+
--copt=\"-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1\" \
7980
--copt=-Werror \
80-
--define="absl=1" \
81+
--define=\"absl=1\" \
8182
--features=external_include_paths \
8283
--keep_going \
8384
--show_timestamps \
84-
--test_env="GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1" \
85-
--test_env="TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo" \
85+
--test_env=\"GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1\" \
86+
--test_env=\"TZDIR=/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo\" \
8687
--test_output=errors \
8788
--test_tag_filters=-benchmark \
88-
${BAZEL_EXTRA_ARGS:-}
89+
${BAZEL_EXTRA_ARGS:-}"
8990
done
9091
done
9192
done

‎ci/linux_gcc-latest_libstdcxx_bazel.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ if [[ ${USE_BAZEL_CACHE:-0} -ne 0 ]]; then
5151
BAZEL_EXTRA_ARGS="--remote_cache=https://storage.googleapis.com/absl-bazel-remote-cache/${container_key} --google_credentials=/keystore/73103_absl-bazel-remote-cache ${BAZEL_EXTRA_ARGS:-}"
5252
fi
5353

54-
# Avoid depending on external sites like GitHub by checking --distdir for
55-
# external dependencies first.
56-
# https://docs.bazel.build/versions/master/guide.html#distdir
57-
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -d "${KOKORO_GFILE_DIR}/distdir" ]]; then
58-
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly ${DOCKER_EXTRA_ARGS:-}"
59-
BAZEL_EXTRA_ARGS="--distdir=/distdir ${BAZEL_EXTRA_ARGS:-}"
54+
# Use Bazel Vendor mode to reduce reliance on external dependencies.
55+
# See https://bazel.build/external/vendor and the Dockerfile for
56+
# an explaination of how this works.
57+
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f "${KOKORO_GFILE_DIR}/distdir/abseil-cpp_vendor.tar.gz" ]]; then
58+
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly --env=BAZEL_VENDOR_ARCHIVE=/distdir/abseil-cpp_vendor.tar.gz ${DOCKER_EXTRA_ARGS:-}"
59+
BAZEL_EXTRA_ARGS="--vendor_dir=/abseil-cpp_vendor ${BAZEL_EXTRA_ARGS:-}"
6060
fi
6161

6262
for std in ${STD}; do
@@ -71,7 +71,7 @@ for std in ${STD}; do
7171
--rm \
7272
${DOCKER_EXTRA_ARGS:-} \
7373
${DOCKER_CONTAINER} \
74-
/bin/sh -c "
74+
/bin/bash --login -c "
7575
cp -r /abseil-cpp-ro/* /abseil-cpp/
7676
if [ -n \"${ALTERNATE_OPTIONS:-}\" ]; then
7777
cp ${ALTERNATE_OPTIONS:-} absl/base/options.h || exit 1

‎ci/windows_msvc_cmake.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SETLOCAL ENABLEDELAYEDEXPANSION
1616

1717
:: The version of GoogleTest to be used in the CMake tests in this directory.
1818
:: Keep this in sync with the version in the WORKSPACE file.
19-
SET ABSL_GOOGLETEST_VERSION=1.16.0
19+
SET ABSL_GOOGLETEST_VERSION=1.17.0
2020
SET ABSL_GOOGLETEST_DOWNLOAD_URL=https://github.com/google/googletest/releases/download/v%ABSL_GOOGLETEST_VERSION%/googletest-%ABSL_GOOGLETEST_VERSION%.tar.gz
2121

2222
:: Replace '\' with '/' in Windows paths for CMake.

0 commit comments

Comments
 (0)