From 8a2ae84388861a3152766c804e720f29073232a8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 06:56:56 +0000 Subject: [PATCH 1/2] chore(deps): update dependency com_google_protobuf to v3.22.0 --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c61289baef8..8e2331a82eb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -6,9 +6,9 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") # Define before rules_proto, otherwise we receive the version of com_google_protobuf from there http_archive( name = "com_google_protobuf", - sha256 = "930c2c3b5ecc6c9c12615cf5ad93f1cd6e12d0aba862b572e076259970ac3a53", - strip_prefix = "protobuf-3.21.12", - urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.12.tar.gz"], + sha256 = "a1562006dbd31e79c12f944c359495807900a8b71f5bf0f6fa7741898259b2cd", + strip_prefix = "protobuf-3.22.0", + urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.22.0.tar.gz"], ) http_archive( From 2aa9df007c7e96540088bfbac95d2daf5c0c3348 Mon Sep 17 00:00:00 2001 From: Johan Brandhorst-Satzkorn Date: Sun, 19 Feb 2023 06:54:08 +0000 Subject: [PATCH 2/2] Add googletest and specify toolchain version --- .github/workflows/ci.yml | 2 ++ .github/workflows/renovate.yml | 2 ++ WORKSPACE | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb24ca19ed1..7e79074f1f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,6 +75,8 @@ jobs: startup --output_base /home/vscode/.cache/_grpc_gateway_bazel build --test_output errors build --features race + # Protobuf v3.22.0+ requires C++14 + build --repo_env=BAZEL_CXXOPTS=-std=c++14 # Workaround https://github.com/bazelbuild/bazel/issues/3645 # See https://docs.bazel.build/versions/0.23.0/command-line-reference.html build --local_ram_resources=7168 # Github runners have 7G of memory diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index f6e1b97eb39..0ba250bd3ce 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -30,6 +30,8 @@ jobs: startup --output_base /home/vscode/.cache/_grpc_gateway_bazel build --test_output errors build --features race + # Protobuf v3.22.0+ requires C++14 + build --repo_env=BAZEL_CXXOPTS=-std=c++14 # Workaround https://github.com/bazelbuild/bazel/issues/3645 # See https://docs.bazel.build/versions/0.23.0/command-line-reference.html build --local_ram_resources=7168 # Github runners have 7G of memory diff --git a/WORKSPACE b/WORKSPACE index 8e2331a82eb..d79ee435b12 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,6 +3,13 @@ workspace(name = "grpc_ecosystem_grpc_gateway") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") +http_archive( + name = "com_google_googletest", + sha256 = "ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632", + strip_prefix = "googletest-1.13.0", + urls = ["https://github.com/google/googletest/archive/v1.13.0.zip"], +) + # Define before rules_proto, otherwise we receive the version of com_google_protobuf from there http_archive( name = "com_google_protobuf",