Change Git tag of googletest to the 1.11.0 release. (#676)

jonsimantov · web-flow · commit e96198051d81 · 2021-10-06T18:34:09.000Z
* Change Git tag of googletest to the 1.11.0 release.

This is already the version set in download_googletest.py, and is the
version that the integration tests have been built/tested with.

(Because the integration tests do some internal GoogleTest stuff, it's
risky to pin to the main branch.)

* Add comment explaining GoogleTest version.
diff --git a/admob/integration_test/googletest.cmake b/admob/integration_test/googletest.cmake
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/build"
   CONFIGURE_COMMAND ""
diff --git a/analytics/integration_test/googletest.cmake b/analytics/integration_test/googletest.cmake
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/build"
   CONFIGURE_COMMAND ""
diff --git a/database/integration_test/googletest.cmake b/database/integration_test/googletest.cmake
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/build"
   CONFIGURE_COMMAND ""
diff --git a/dynamic_links/integration_test/googletest.cmake b/dynamic_links/integration_test/googletest.cmake
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -13,6 +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.
 
 # This CMake file is taken from:
 # https://github.com/google/googletest/blob/master/googletest/README.md#incorporating-into-an-existing-cmake-project
@@ -24,7 +25,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           master
+  GIT_TAG           "release-1.11.0"
   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
@@ -35,6 +35,7 @@
 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'
 # Top-level directory inside the zip file to ignore.
 GOOGLETEST_DIR = os.path.join('googletest-release-1.11.0')
