From 20b2ec04d94d458d9ce4b07b44bbff60b9fb021c Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Fri, 4 Nov 2022 11:24:36 -0700 Subject: [PATCH] Update bazel packages Signed-off-by: Andrei Vagin --- WORKSPACE | 54 ++++++++++++++++++------------------- images/default/Dockerfile | 2 +- tools/grpc_extra_deps.patch | 19 +++++++++++++ 3 files changed, 46 insertions(+), 29 deletions(-) create mode 100644 tools/grpc_extra_deps.patch diff --git a/WORKSPACE b/WORKSPACE index 8b589dbe5..ee930609d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,10 +15,10 @@ http_file( # Bazel/starlark utilities. http_archive( name = "bazel_skylib", - sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728", + sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz", ], ) @@ -42,19 +42,19 @@ http_archive( # Allow for patching of the go_sdk. "//tools:rules_go_sdk.patch", ], - sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369", + sha256 = "099a9fb96a376ccbbb7d291ed4ecbdfd42f6bc822ab77ae6f1b5cb9e914e94fa", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.35.0/rules_go-v0.35.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.35.0/rules_go-v0.35.0.zip", ], ) http_archive( name = "bazel_gazelle", - sha256 = "501deb3d5695ab658e82f6f6f549ba681ea3ca2a5fb7911154b5aa45596183fa", + sha256 = "efbbba6ac1a4fd342d5122cbdfdb82aeb2cf2862e35022c752eaddffada7c3f3", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.27.0/bazel-gazelle-v0.27.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.27.0/bazel-gazelle-v0.27.0.tar.gz", ], ) @@ -70,7 +70,7 @@ go_download_sdk( # time on our continuous integration. patch = "//tools:go_types_memoize.patch", patch_strip = 2, - version = "1.18.3", + version = "1.19.3", ) gazelle_dependencies() @@ -116,12 +116,9 @@ go_repository( # Load C++ rules. http_archive( name = "rules_cc", - sha256 = "67412176974bfce3f4cf8bdaff39784a72ed709fc58def599d1f68710b58d68b", - strip_prefix = "rules_cc-b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e.zip", - "https://github.com/bazelbuild/rules_cc/archive/b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e.zip", - ], + urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.0.4/rules_cc-0.0.4.tar.gz"], + sha256 = "af6cc82d87db94585bceeda2561cb8a9d55ad435318ccb4ddfee18a43580fb5d", + strip_prefix = "rules_cc-0.0.4", ) # Load C++ cross-compilation toolchains. @@ -141,11 +138,10 @@ cc_crosstool(name = "crosstool") # Load protobuf dependencies. http_archive( name = "rules_proto", - sha256 = "66bfdf8782796239d3875d37e7de19b1d94301e8972b3cbd2446b332429b4df1", - strip_prefix = "rules_proto-4.0.0", + sha256 = "80d3a4ec17354cccc898bfe32118edd934f851b03029d63ef3fc7c8663a7415c", + strip_prefix = "rules_proto-5.3.0-21.5", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.5.tar.gz", ], ) @@ -629,24 +625,26 @@ rules_pkg_dependencies() # System Call test dependencies. # grpc also has a dependency on abseil but as this is before grpc dependency # declaration, it will take precedence over grpc's one -# Version LTS 20210324.2 +# Version LTS 20220623.1 http_archive( name = "com_google_absl", - sha256 = "1764491a199eb9325b177126547f03d244f86b4ff28f16f206c7b3e7e4f777ec", - strip_prefix = "abseil-cpp-278e0a071885a22dcd2fd1b5576cc44757299343", + sha256 = "a6be76f59c474a215f2df5116b312257462e97f2e38b2bfa6df8b6a55710b058", + strip_prefix = "abseil-cpp-8c0b94e793a66495e0b1f34a5eb26bd7dc672db0", urls = [ - "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/278e0a071885a22dcd2fd1b5576cc44757299343.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/278e0a071885a22dcd2fd1b5576cc44757299343.tar.gz", + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/8c0b94e793a66495e0b1f34a5eb26bd7dc672db0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/8c0b94e793a66495e0b1f34a5eb26bd7dc672db0.tar.gz", ], ) # Load C++ grpc rules. http_archive( + patch_args = ["-p1"], + patches = ["//tools:grpc_extra_deps.patch"], name = "com_github_grpc_grpc", - sha256 = "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", - strip_prefix = "grpc-1.26.0", + sha256 = "fb1ed98eb3555877d55eb2b948caca44bc8601c6704896594de81558639709ef", + strip_prefix = "grpc-1.50.1", urls = [ - "https://github.com/grpc/grpc/archive/v1.26.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.50.1.tar.gz", ], ) diff --git a/images/default/Dockerfile b/images/default/Dockerfile index 11149bd51..5ac69facd 100644 --- a/images/default/Dockerfile +++ b/images/default/Dockerfile @@ -25,6 +25,6 @@ RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud # Download the official bazel binary. The APT repository isn't used because there is not packages for arm64. -RUN sh -c 'curl -o /usr/local/bin/bazel https://releases.bazel.build/4.2.1/release/bazel-4.2.1-linux-$(uname -m | sed s/aarch64/arm64/) && chmod ugo+x /usr/local/bin/bazel' +RUN sh -c 'curl -o /usr/local/bin/bazel https://releases.bazel.build/5.3.2/release/bazel-5.3.2-linux-$(uname -m | sed s/aarch64/arm64/) && chmod ugo+x /usr/local/bin/bazel' WORKDIR /workspace ENTRYPOINT ["/usr/local/bin/bazel"] diff --git a/tools/grpc_extra_deps.patch b/tools/grpc_extra_deps.patch new file mode 100644 index 000000000..691bb988e --- /dev/null +++ b/tools/grpc_extra_deps.patch @@ -0,0 +1,19 @@ +diff --git a/bazel/grpc_extra_deps.bzl b/bazel/grpc_extra_deps.bzl +index 4d8afa3131..b42224501f 100644 +--- a/bazel/grpc_extra_deps.bzl ++++ b/bazel/grpc_extra_deps.bzl +@@ -52,14 +52,6 @@ def grpc_extra_deps(ignore_version_differences = False): + + api_dependencies() + +- go_rules_dependencies() +- go_register_toolchains(version = "1.18") +- gazelle_dependencies() +- +- # Pull-in the go 3rd party dependencies for protoc_gen_validate, which is +- # needed for building C++ xDS protos +- go_third_party() +- + apple_rules_dependencies(ignore_version_differences = ignore_version_differences) + + apple_support_dependencies()