bazel: change bazelisk for M1 support

This uses a fat binary version of bazelisk to better support arm bazel Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
envoyproxy · Dec 15, 2021 · db45c48 · db45c48
1 parent d0c9843
commit db45c48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/bazelw b/bazelw
@@ -4,9 +4,8 @@ set -euo pipefail
 
 readonly bazelisk_version="1.10.1"
 if [[ $OSTYPE == darwin* ]]; then
-  # TODO: Support M1 once https://github.com/envoyproxy/envoy/issues/16482
-  readonly bazel_platform="darwin-amd64"
-  readonly bazel_version_sha="e485bbf84532d02a60b0eb23c702610b5408df3a199087a4f2b5e0995bbf2d5a"
+  readonly bazel_platform="darwin"
+  readonly bazel_version_sha="d3014e478fe6ebbc290e6eccdcc154e93f894300b63d521ec8d22c2e24f32892"
 else
   readonly bazel_platform="linux-amd64"
   readonly bazel_version_sha="4cb534c52cdd47a6223d4596d530e7c9c785438ab3b0a49ff347e991c210b2cd"

diff --git a/envoy b/envoy
+3 −3		bazel/repository_locations.bzl
+22 −23		docs/root/configuration/operations/tools/router_check.rst
+17 −3		docs/root/operations/admin.rst
+2 −0		docs/root/version_history/current.rst
+3 −2		envoy/stream_info/stream_info.h
+22 −2		source/server/admin/prometheus_stats.cc
+1 −0		source/server/admin/prometheus_stats.h
+12 −3		source/server/admin/stats_handler.cc
+1 −1		source/server/admin/stats_handler.h
+73 −13		test/server/admin/prometheus_stats_test.cc
+127 −2		test/server/admin/stats_handler_test.cc