From 785b85426cf0520ab97d4278de2bc96f88df904a Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 28 Mar 2023 20:38:56 +0200 Subject: [PATCH] Upgrade abseil to 20230125.2 (#32733) To get a fix for https://github.com/abseil/abseil-cpp/issues/1419#issuecomment-1485282854 --- bazel/grpc_deps.bzl | 8 ++++---- third_party/abseil-cpp | 2 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 30b0a7723ab..f403fcee7a9 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -329,11 +329,11 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - sha256 = "3ea49a7d97421b88a8c48a0de16c16048e17725c7ec0f1d3ea2683a2a75adc21", - strip_prefix = "abseil-cpp-20230125.0", + sha256 = "9a2b5752d7bfade0bdeee2701de17c9480620f8b237e1964c1b9967c75374906", + strip_prefix = "abseil-cpp-20230125.2", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20230125.0.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/20230125.0.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20230125.2.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/20230125.2.tar.gz", ], ) diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index 78be63686ba..b971ac5250e 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit 78be63686ba732b25052be15f8d6dee891c05749 +Subproject commit b971ac5250ea8de900eae9f95e06548d14cd95fe diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 67e6be1a4b9..8f3bdcc9b60 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $2 " " $1 }' | sort >"$submodules" cat <"$want_submodules" -third_party/abseil-cpp 78be63686ba732b25052be15f8d6dee891c05749 +third_party/abseil-cpp b971ac5250ea8de900eae9f95e06548d14cd95fe third_party/benchmark 361e8d1cfe0c6c36d30b39f1b61302ece5507320 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/boringssl-with-bazel 8872d958b7b07173bf29b8f3b8bf36a1ca8c94a3