chore: bump Bazel from 5.2.0 to 6.5.0

martijneken · martijneken · commit 0b65cd078452 · 2024-08-03T05:39:27.000Z
Signed-off-by: Martijn Stevenson &lt;mstevenson@google.com&gt;
diff --git a/.bazelrc b/.bazelrc
@@ -1,3 +1,6 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+
 # Pass CC, CXX and PATH from the environment.
 build --action_env=CC
 build --action_env=CXX
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-5.2.0
+6.5.0
diff --git a/bazel/external/googletest.patch b/bazel/external/googletest.patch
@@ -0,0 +1,13 @@
+diff --git a/BUILD.bazel b/BUILD.bazel
+index 8099642a85..3598661079 100644
+--- a/BUILD.bazel
++++ b/BUILD.bazel
+@@ -40,7 +40,7 @@ exports_files(["LICENSE"])
+
+ config_setting(
+     name = "windows",
+-    constraint_values = ["@bazel_tools//platforms:windows"],
++    constraint_values = ["@platforms//os:windows"],
+ )
+
+ config_setting(
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -134,6 +134,8 @@ def proxy_wasm_cpp_host_repositories():
         sha256 = "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
         strip_prefix = "googletest-release-1.10.0",
         urls = ["https://github.com/google/googletest/archive/release-1.10.0.tar.gz"],
+        patches = ["@proxy_wasm_cpp_host//bazel/external:googletest.patch"],
+        patch_args = ["-p1"],
     )
 
     # NullVM dependencies.

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,8 @@ def proxy_wasm_cpp_host_repositories():`
`134`	`134`	`sha256 = "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",`
`135`	`135`	`strip_prefix = "googletest-release-1.10.0",`
`136`	`136`	`urls = ["https://github.com/google/googletest/archive/release-1.10.0.tar.gz"],`
	`137`	`+ patches = ["@proxy_wasm_cpp_host//bazel/external:googletest.patch"],`
	`138`	`+ patch_args = ["-p1"],`
`137`	`139`	`)`
`138`	`140`
`139`	`141`	`# NullVM dependencies.`