diff --git a/analytics/integration_test/googletest.cmake b/analytics/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/analytics/integration_test/googletest.cmake +++ b/analytics/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/app/integration_test/googletest.cmake b/app/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/app/integration_test/googletest.cmake +++ b/app/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/app_check/integration_test/googletest.cmake b/app_check/integration_test/googletest.cmake index 63d25825dd..a88bd3775e 100644 --- a/app_check/integration_test/googletest.cmake +++ b/app_check/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/auth/integration_test/googletest.cmake b/auth/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/auth/integration_test/googletest.cmake +++ b/auth/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/cmake/external/googletest.cmake b/cmake/external/googletest.cmake index 329befefe5..db7ed2c3f3 100644 --- a/cmake/external/googletest.cmake +++ b/cmake/external/googletest.cmake @@ -18,15 +18,16 @@ if(TARGET googletest OR NOT DOWNLOAD_GOOGLETEST) return() endif() -set(version 1.11.0) # June 2021 +# Pin to the v1.18.0 commit hash (August 2026) to ensure the tag does not change. +set(version 063de7e9578f82b369302001269680b4b1553359) ExternalProject_Add( googletest DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR} DOWNLOAD_NAME googletest-${version}.tar.gz - URL https://github.com/google/googletest/archive/release-${version}.tar.gz - URL_HASH SHA256=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 + URL https://github.com/google/googletest/archive/${version}.tar.gz + URL_HASH SHA256=623fe05d283020f37a579a8985ba338091ac7229da62b5591ff40acdf05b95e2 PREFIX ${PROJECT_BINARY_DIR} diff --git a/database/integration_test/googletest.cmake b/database/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/database/integration_test/googletest.cmake +++ b/database/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/firestore/integration_test/googletest.cmake b/firestore/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/firestore/integration_test/googletest.cmake +++ b/firestore/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/firestore/integration_test_internal/googletest.cmake b/firestore/integration_test_internal/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/firestore/integration_test_internal/googletest.cmake +++ b/firestore/integration_test_internal/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/functions/integration_test/googletest.cmake b/functions/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/functions/integration_test/googletest.cmake +++ b/functions/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/installations/integration_test/googletest.cmake b/installations/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/installations/integration_test/googletest.cmake +++ b/installations/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/messaging/integration_test/googletest.cmake b/messaging/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/messaging/integration_test/googletest.cmake +++ b/messaging/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/remote_config/integration_test/googletest.cmake b/remote_config/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/remote_config/integration_test/googletest.cmake +++ b/remote_config/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/storage/integration_test/googletest.cmake b/storage/integration_test/googletest.cmake index 8b0069a034..bd28844e09 100644 --- a/storage/integration_test/googletest.cmake +++ b/storage/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND "" diff --git a/testing/test_framework/download_googletest.py b/testing/test_framework/download_googletest.py index 21515bc06f..931a322b54 100755 --- a/testing/test_framework/download_googletest.py +++ b/testing/test_framework/download_googletest.py @@ -35,10 +35,13 @@ SRC_DIR = os.path.relpath(os.path.dirname(__file__)) TAG = os.path.basename(__file__) -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. -GOOGLETEST_ZIP = 'https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip' +# Pin to the v1.18.0 commit hash to ensure the tag does not change. +GOOGLETEST_COMMIT = '063de7e9578f82b369302001269680b4b1553359' +GOOGLETEST_ZIP = ( + 'https://github.com/google/googletest/archive/%s.zip' % GOOGLETEST_COMMIT +) # Top-level directory inside the zip file to ignore. -GOOGLETEST_DIR = os.path.join('googletest-release-1.11.0') +GOOGLETEST_DIR = 'googletest-%s' % GOOGLETEST_COMMIT # The GoogleTest code is copied into this subdirectory. # This structure matches where the files are placed by CMake. diff --git a/ump/integration_test/googletest.cmake b/ump/integration_test/googletest.cmake index 91fc42cc10..29c279388a 100644 --- a/ump/integration_test/googletest.cmake +++ b/ump/integration_test/googletest.cmake @@ -13,7 +13,7 @@ # limitations under the License. # Download GoogleTest from GitHub as an external project. -# Pin to 1.11.0 because we touch internal GoogleTest structures that could change in the future. +# Pin to the v1.18.0 commit hash to ensure the tag does not change. # This CMake file is taken from: # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project @@ -25,7 +25,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG "release-1.11.0" + GIT_TAG "063de7e9578f82b369302001269680b4b1553359" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CONFIGURE_COMMAND ""