bazel: update to v5.0.0 (envoyproxy#19706)

* bazel: update to v5.0.0 * Updated envoy-build-tools dependency * Removed envoy_build_tools.patch * Fixed java runtime version flag * Fixed gcc test * Remove outdated java flags * Workaround attempt for test failures * Incorporate review comments Signed-off-by: Faseela K <faseela.k@est.tech> Signed-off-by: Ryan Northey <ryan@synca.io>
phlax · Nov 15, 2022 · 66e3fde · 66e3fde
1 parent adc246d
commit 66e3fde
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 55 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -16,8 +16,9 @@ build --color=yes
 build --workspace_status_command="bash bazel/get_workspace_status"
 build --incompatible_strict_action_env
 build --host_force_python=PY3
-build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
-build --javabase=@bazel_tools//tools/jdk:remote_jdk11
+build --java_runtime_version=remotejdk_11
+build --tool_java_runtime_version=remotejdk_11
+
 build --enable_platform_specific_config
 
 # Allow tags to influence execution requirements

diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-4.2.1
+5.0.0
diff --git a/api/test/build/BUILD b/api/test/build/BUILD
@@ -5,6 +5,8 @@ licenses(["notice"])  # Apache 2
 api_cc_test(
     name = "build_test",
     srcs = ["build_test.cc"],
+    # Workaround for https://github.com/bazelbuild/bazel/issues/13819
+    linkstatic = True,
     deps = [
         "//envoy/api/v2:pkg_cc_proto",
         "//envoy/service/accesslog/v2:pkg_cc_proto",

diff --git a/api/test/validate/BUILD b/api/test/validate/BUILD
@@ -5,6 +5,8 @@ licenses(["notice"])  # Apache 2
 api_cc_test(
     name = "pgv_test",
     srcs = ["pgv_test.cc"],
+    # Workaround for https://github.com/bazelbuild/bazel/issues/13819
+    linkstatic = True,
     deps = [
         "@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",

diff --git a/bazel/external/envoy_build_tools.patch b/bazel/external/envoy_build_tools.patch
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -224,11 +224,7 @@ def envoy_dependencies(skip_targets = []):
     external_http_archive("com_github_google_flatbuffers")
     external_http_archive("bazel_toolchains")
     external_http_archive("bazel_compdb")
-    external_http_archive(
-        name = "envoy_build_tools",
-        patch_args = ["-p1"],
-        patches = ["@envoy//bazel/external:envoy_build_tools.patch"],
-    )
+    external_http_archive("envoy_build_tools")
     external_http_archive("rules_cc")
     external_http_archive("rules_pkg")
     _com_github_fdio_vpp_vcl()

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -25,14 +25,13 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "bazel-toolchains",
         project_desc = "Bazel toolchain configs for RBE",
         project_url = "https://github.com/bazelbuild/bazel-toolchains",
-        version = "4.1.0",
-        sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
+        version = "5.1.1",
+        sha256 = "e52789d4e89c3e2dc0e3446a9684626a626b6bec3fde787d70bae37c6ebcc47f",
         strip_prefix = "bazel-toolchains-{version}",
         urls = [
-            "https://github.com/bazelbuild/bazel-toolchains/releases/download/{version}/bazel-toolchains-{version}.tar.gz",
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/{version}.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/archive/v{version}.tar.gz",
         ],
-        release_date = "2021-05-21",
+        release_date = "2021-11-30",
         use_category = ["build"],
     ),
     build_bazel_rules_apple = dict(
@@ -65,11 +64,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "envoy-build-tools",
         project_desc = "Common build tools shared by the Envoy/UDPA ecosystem",
         project_url = "https://github.com/envoyproxy/envoy-build-tools",
-        version = "55a7bbe700586729bd38231a9a6f3dcd1ff85e7d",
-        sha256 = "11893be9f0334a7e12ffc04b3b034dffe0bb5516d36654011532136c7929ae27",
+        version = "1162be3669036d2c09359a95d39ff65fc6608f39",
+        sha256 = "8f5ac011a443649a27a7b82bc447de4f564f9cb5b6812d87c3bc1b1e74d2055f",
         strip_prefix = "envoy-build-tools-{version}",
         urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"],
-        release_date = "2021-09-28",
+        release_date = "2022-01-28",
         use_category = ["build"],
     ),
     boringssl = dict(