summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2020-04-07 10:28:30 -0700
committerGravatar Gennadiy Rozental <rogeeff@google.com>2020-04-07 21:50:15 -0400
commit1112609635037a32435de7aa70a9188dcb591458 (patch)
tree03e98d4717ebbe19824617c8ea49cd0de35b4b81 /ci
parent73ea9a95720c4f4faff9b1bcbad48d23f2cb2a46 (diff)
Export of internal Abseil changes
-- c162645dba4de6f5f1c8b6e8a29a8da9f9e0aa52 by Derek Mauro <dmauro@google.com>: Update linux_clang-latest container to one based on Ubuntu 18.04, which has libstdc++-8. PiperOrigin-RevId: 305287658 GitOrigin-RevId: c162645dba4de6f5f1c8b6e8a29a8da9f9e0aa52 Change-Id: I3f31daf0d8c445008c78f0e10ae6af753cea756b
Diffstat (limited to 'ci')
-rwxr-xr-xci/linux_clang-latest_libstdcxx_bazel.sh2
-rw-r--r--ci/linux_docker_containers.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/linux_clang-latest_libstdcxx_bazel.sh b/ci/linux_clang-latest_libstdcxx_bazel.sh
index 62696293..d3920741 100755
--- a/ci/linux_clang-latest_libstdcxx_bazel.sh
+++ b/ci/linux_clang-latest_libstdcxx_bazel.sh
@@ -71,7 +71,7 @@ for std in ${STD}; do
-e CC="/opt/llvm/clang/bin/clang" \
-e BAZEL_COMPILER="llvm" \
-e BAZEL_CXXOPTS="-std=${std}" \
- -e CPLUS_INCLUDE_PATH="/usr/include/c++/6" \
+ -e CPLUS_INCLUDE_PATH="/usr/include/c++/8" \
${DOCKER_EXTRA_ARGS:-} \
${DOCKER_CONTAINER} \
/usr/local/bin/bazel test ... \
diff --git a/ci/linux_docker_containers.sh b/ci/linux_docker_containers.sh
index cf056b34..82a10ac6 100644
--- a/ci/linux_docker_containers.sh
+++ b/ci/linux_docker_containers.sh
@@ -16,6 +16,6 @@
# Test scripts should source this file to get the identifiers.
readonly LINUX_ALPINE_CONTAINER="gcr.io/google.com/absl-177019/alpine:20191016"
-readonly LINUX_CLANG_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_clang-latest:20200319"
+readonly LINUX_CLANG_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_clang-latest:20200401"
readonly LINUX_GCC_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-latest:20200319"
readonly LINUX_GCC_49_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-4.9:20191018"