diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 11:49:29 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 11:49:29 -0400 |
| commit | c1afa8b8238c25591ca80d068477aa7d4ce05fc8 (patch) | |
| tree | 284a9f8b319de5783ff83ad004a9e390cb60fd0d /ci/cmake_common.sh | |
| parent | 23778b53f420f54eebc195dd8430e79bda165e5b (diff) | |
| parent | 4447c7562e3bc702ade25105912dce503f0c4010 (diff) | |
| download | abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.tar.gz abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.tar.bz2 abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.zip | |
Merge new upstream LTS 20240722.0
Diffstat (limited to 'ci/cmake_common.sh')
| -rw-r--r-- | ci/cmake_common.sh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/ci/cmake_common.sh b/ci/cmake_common.sh index 784b3815..c8a5b857 100644 --- a/ci/cmake_common.sh +++ b/ci/cmake_common.sh @@ -14,16 +14,6 @@ # The commit of GoogleTest to be used in the CMake tests in this directory. # Keep this in sync with the commit in the WORKSPACE file. -# TODO(dmauro): After the next GoogleTest release, use the stable file required -# by Bzlmod. This means downloading a copy of the file and reuploading it to -# avoid changing checksums if the compression is changed by GitHub. It also -# means stop referring to it as a commit and instead use the uploaded filename. -readonly ABSL_GOOGLETEST_COMMIT="f8d7d77c06936315286eb55f8de22cd23c188571" +readonly ABSL_GOOGLETEST_VERSION="1.15.2" -# Avoid depending on GitHub by looking for a cached copy of the commit first. -if [[ -r "${KOKORO_GFILE_DIR:-}/distdir/${ABSL_GOOGLETEST_COMMIT}.zip" ]]; then - DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly ${DOCKER_EXTRA_ARGS:-}" - ABSL_GOOGLETEST_DOWNLOAD_URL="file:///distdir/${ABSL_GOOGLETEST_COMMIT}.zip" -else - ABSL_GOOGLETEST_DOWNLOAD_URL="https://github.com/google/googletest/archive/${ABSL_GOOGLETEST_COMMIT}.zip" -fi +readonly ABSL_GOOGLETEST_DOWNLOAD_URL="https://github.com/google/googletest/releases/download/v${ABSL_GOOGLETEST_VERSION}/googletest-${ABSL_GOOGLETEST_VERSION}.tar.gz" |