diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17465af27d..99264a33d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: env: CC: /usr/bin/gcc-12 CXX: /usr/bin/g++-12 - GOOGLETEST_VERSION: 1.12.1 + GOOGLETEST_VERSION: 1.13.0 PROTOBUF_VERSION: 21.12 run: | sudo -E ./ci/setup_cmake.sh @@ -74,7 +74,7 @@ jobs: env: CC: /usr/bin/gcc-12 CXX: /usr/bin/g++-12 - GOOGLETEST_VERSION: 1.12.1 + GOOGLETEST_VERSION: 1.13.0 PROTOBUF_VERSION: 21.12 run: | sudo -E ./ci/setup_cmake.sh @@ -108,7 +108,7 @@ jobs: env: CC: /usr/bin/clang-14 CXX: /usr/bin/clang++-14 - GOOGLETEST_VERSION: 1.12.1 + GOOGLETEST_VERSION: 1.13.0 PROTOBUF_VERSION: 21.12 run: | sudo -E ./ci/setup_cmake.sh @@ -142,7 +142,7 @@ jobs: env: CC: /usr/bin/clang-14 CXX: /usr/bin/clang++-14 - GOOGLETEST_VERSION: 1.12.1 + GOOGLETEST_VERSION: 1.13.0 PROTOBUF_VERSION: 21.12 run: | sudo -E ./ci/setup_cmake.sh diff --git a/bazel/repository.bzl b/bazel/repository.bzl index 847b8bb9d1..5a4829dc27 100644 --- a/bazel/repository.bzl +++ b/bazel/repository.bzl @@ -47,9 +47,9 @@ def opentelemetry_cpp_deps(): http_archive, name = "com_google_googletest", sha256 = "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2", - strip_prefix = "googletest-release-1.12.1", + strip_prefix = "googletest-release-1.13.0", urls = [ - "https://github.com/google/googletest/archive/release-1.12.1.tar.gz", + "https://github.com/google/googletest/archive/v1.13.0.tar.gz", ], ) diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh index cdce76b38d..9c45217c9b 100755 --- a/ci/setup_cmake.sh +++ b/ci/setup_cmake.sh @@ -13,7 +13,7 @@ if [ "x$CMAKE_VERSION" = "x" ]; then fi if [ "x$GOOGLETEST_VERSION" = "x" ]; then - export GOOGLETEST_VERSION=1.12.1 + export GOOGLETEST_VERSION=1.13.0 fi cmake_install() { @@ -31,9 +31,9 @@ googletest_install() { # https://gist.github.com/dlime/313f74fd23e4267c4a915086b84c7d3d tmp_dir=$(mktemp -d) pushd $tmp_dir - wget https://github.com/google/googletest/archive/release-${GOOGLETEST_VERSION}.tar.gz - tar -xf release-${GOOGLETEST_VERSION}.tar.gz - cd googletest-release-${GOOGLETEST_VERSION}/ + wget https://github.com/google/googletest/archive/v${GOOGLETEST_VERSION}.tar.gz + tar -xf v${GOOGLETEST_VERSION}.tar.gz + cd googletest-${GOOGLETEST_VERSION}/ mkdir build && cd build cmake .. -DBUILD_SHARED_LIBS=ON -DINSTALL_GTEST=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr make -j $(nproc) diff --git a/third_party/googletest b/third_party/googletest index 58d77fa807..b796f7d446 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit 58d77fa8070e8cec2dc1ed015d66b454c8d78850 +Subproject commit b796f7d44681514f58a683a3a71ff17c94edb0c1 diff --git a/third_party_release b/third_party_release index 7290896c2d..319000a22c 100644 --- a/third_party_release +++ b/third_party_release @@ -17,7 +17,7 @@ gRPC=v1.49.2 thrift=0.14.1 abseil=20220623.1 benchmark=v1.5.3 -googletest=release-1.12.1 +googletest=release-1.13.0 ms-gsl=v3.1.0-67-g6f45293 nlohmann-json=v3.10.5 opentelemetry-proto=v0.19.0