aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Mauro <dmauro@google.com>2023-10-12 07:35:06 -0700
committerCopybara-Service <copybara-worker@google.com>2023-10-12 07:35:46 -0700
commit18a26f7967b9415601ad2c0959dae9d831aa86ae (patch)
treec99c7a37753da5d2826a2005806bc3c1c4b5f5c5
parentcb7d5cc8cb837cc7864dd3974f1aa5b3e83cb8ab (diff)
downloadabseil-18a26f7967b9415601ad2c0959dae9d831aa86ae.tar.gz
abseil-18a26f7967b9415601ad2c0959dae9d831aa86ae.tar.bz2
abseil-18a26f7967b9415601ad2c0959dae9d831aa86ae.zip
Update GoogleTest dependency
PiperOrigin-RevId: 572901486 Change-Id: Icb8b8c80cb8b99d9a3203f4971fc53fe64a1ae60
-rw-r--r--WORKSPACE11
-rw-r--r--ci/cmake_common.sh2
-rwxr-xr-xci/windows_msvc_cmake.bat2
3 files changed, 8 insertions, 7 deletions
diff --git a/WORKSPACE b/WORKSPACE
index 56279d47..ffe387a3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,11 +20,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# GoogleTest/GoogleMock framework. Used by most unit-tests.
http_archive(
- name = "com_google_googletest", # 2023-08-02T16:45:10Z
- sha256 = "c4f675500e09da97fd5a2b9c3fdadf48de858a036db565d52e6835c96eeea147",
- strip_prefix = "googletest-843976e4f582ccb76cf87e0f128585324335779b",
- # Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh.
- urls = ["https://github.com/google/googletest/archive/843976e4f582ccb76cf87e0f128585324335779b.zip"],
+ name = "com_google_googletest", # 2023-10-05T21:13:04Z
+ sha256 = "ba96972e0aa8a1428596570ac573958c1c879483bd148a2b72994453f9dfa7c2",
+ strip_prefix = "googletest-2dd1c131950043a8ad5ab0d2dda0e0970596586a",
+ # Keep this URL in sync with ABSL_GOOGLETEST_COMMIT in ci/cmake_common.sh and
+ # ci/windows_msvc_cmake.bat.
+ urls = ["https://github.com/google/googletest/archive/2dd1c131950043a8ad5ab0d2dda0e0970596586a.zip"],
)
# RE2 (the regular expression library used by GoogleTest)
diff --git a/ci/cmake_common.sh b/ci/cmake_common.sh
index 4b02cb1f..98976bc1 100644
--- a/ci/cmake_common.sh
+++ b/ci/cmake_common.sh
@@ -14,7 +14,7 @@
# 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.
-readonly ABSL_GOOGLETEST_COMMIT="843976e4f582ccb76cf87e0f128585324335779b"
+readonly ABSL_GOOGLETEST_COMMIT="2dd1c131950043a8ad5ab0d2dda0e0970596586a"
# 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
diff --git a/ci/windows_msvc_cmake.bat b/ci/windows_msvc_cmake.bat
index 23454b54..b026352a 100755
--- a/ci/windows_msvc_cmake.bat
+++ b/ci/windows_msvc_cmake.bat
@@ -14,7 +14,7 @@
SETLOCAL ENABLEDELAYEDEXPANSION
-SET ABSL_GOOGLETEST_COMMIT=843976e4f582ccb76cf87e0f128585324335779b
+SET ABSL_GOOGLETEST_COMMIT=2dd1c131950043a8ad5ab0d2dda0e0970596586a
IF EXIST %KOKORO_GFILE_DIR%\distdir\%ABSL_GOOGLETEST_COMMIT%.zip (
SET ABSL_GOOGLETEST_DOWNLOAD_URL=file://%KOKORO_GFILE_DIR%\distdir\%ABSL_GOOGLETEST_COMMIT%.zip