Merge branch 'main' into fix_upgrade_abseil

open-telemetry · Mar 21, 2024 · e658b65 · e658b65
2 parents d05ed23 + 788631d
commit e658b65
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/bazel/repository.bzl b/bazel/repository.bzl
@@ -46,10 +46,10 @@ def opentelemetry_cpp_deps():
     maybe(
         http_archive,
         name = "com_google_googletest",
-        sha256 = "ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363",
-        strip_prefix = "googletest-1.13.0",
+        sha256 = "8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7",
+        strip_prefix = "googletest-1.14.0",
         urls = [
-            "https://github.com/google/googletest/archive/v1.13.0.tar.gz",
+            "https://github.com/google/googletest/archive/v1.14.0.tar.gz",
         ],
     )
 

diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh
@@ -15,7 +15,7 @@ fi
 
 if [ -z "${GOOGLETEST_VERSION}" ]; then
   # Version by default. Requires C++14.
-  export GOOGLETEST_VERSION=1.13.0
+  export GOOGLETEST_VERSION=1.14.0
 fi
 
 OLD_GOOGLETEST_VERSION_REGEXP="^1\.([0-9]|10|11|12)(\..*)?$"

diff --git a/third_party/googletest b/third_party/googletest
diff --git a/third_party_release b/third_party_release
@@ -16,7 +16,7 @@
 gRPC=v1.49.2
 abseil=20240116.1
 benchmark=v1.7.1
-googletest=1.13.0
+googletest=1.14.0
 ms-gsl=v3.1.0-67-g6f45293
 nlohmann-json=v3.11.2
 opentelemetry-proto=v1.1.0