From c7676af08be0e098fdad8e8723d22c72c3c77d6f Mon Sep 17 00:00:00 2001 From: Oblivion Date: Mon, 4 Nov 2024 18:04:46 +0000 Subject: [PATCH 1/2] bump gRPC to 1.67 --- bazel/repository.bzl | 4 ++-- ci/do_ci.sh | 2 +- ci/setup_grpc.sh | 2 +- third_party_release | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bazel/repository.bzl b/bazel/repository.bzl index 508b95a39a..f8a0de4c24 100644 --- a/bazel/repository.bzl +++ b/bazel/repository.bzl @@ -77,9 +77,9 @@ def opentelemetry_cpp_deps(): http_archive, name = "com_github_grpc_grpc", sha256 = "f40bde4ce2f31760f65dc49a2f50876f59077026494e67dccf23992548b1b04f", - strip_prefix = "grpc-1.62.0", + strip_prefix = "grpc-1.67.1", urls = [ - "https://github.com/grpc/grpc/archive/refs/tags/v1.62.0.tar.gz", + "https://github.com/grpc/grpc/archive/refs/tags/v1.67.1.tar.gz", ], ) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index c31d5e887a..a5f7b4ed07 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -546,7 +546,7 @@ elif [[ "$1" == "code.coverage" ]]; then cp tmp_coverage.info coverage.info exit 0 elif [[ "$1" == "third_party.tags" ]]; then - echo "gRPC=v1.49.2" > third_party_release + echo "gRPC=v1.67.1" > third_party_release echo "abseil=20240116.1" >> third_party_release git submodule foreach --quiet 'echo "$name=$(git describe --tags HEAD)"' | sed 's:.*/::' >> third_party_release exit 0 diff --git a/ci/setup_grpc.sh b/ci/setup_grpc.sh index dc78c172a8..e1d7cdaa21 100755 --- a/ci/setup_grpc.sh +++ b/ci/setup_grpc.sh @@ -7,7 +7,7 @@ set -e export DEBIAN_FRONTEND=noninteractive old_grpc_version='v1.33.2' new_grpc_version='v1.49.2' -modern_grpc_version='v1.55.0' +modern_grpc_version='v1.67.1' gcc_version_for_new_grpc='5.1' std_version='14' if [ ! -z "${CXX_STANDARD}" ]; then diff --git a/third_party_release b/third_party_release index 7362473f60..a73c5fd18c 100644 --- a/third_party_release +++ b/third_party_release @@ -13,7 +13,7 @@ # git submodule status # -gRPC=v1.49.2 +gRPC=v1.67.1 abseil=20240116.1 benchmark=v1.8.3 googletest=1.14.0 From 2c6c1770d23a12834575859cbca08a768b0b073f Mon Sep 17 00:00:00 2001 From: Ehsan Saei <71217171+esigo@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:06:11 +0100 Subject: [PATCH 2/2] fix CI --- bazel/repository.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repository.bzl b/bazel/repository.bzl index f8a0de4c24..1503cf26ee 100644 --- a/bazel/repository.bzl +++ b/bazel/repository.bzl @@ -76,7 +76,7 @@ def opentelemetry_cpp_deps(): maybe( http_archive, name = "com_github_grpc_grpc", - sha256 = "f40bde4ce2f31760f65dc49a2f50876f59077026494e67dccf23992548b1b04f", + sha256 = "d74f8e99a433982a12d7899f6773e285c9824e1d9a173ea1d1fb26c9bd089299", strip_prefix = "grpc-1.67.1", urls = [ "https://github.com/grpc/grpc/archive/refs/tags/v1.67.1.tar.gz",