chore(deps): update io_buildbuddy_buildbuddy_toolchain digest to ffd2…

…96b (#408) * chore(deps): update io_buildbuddy_buildbuddy_toolchain digest to ffd296b * Update BuildBuddy toolchain MODULE.bazel archive_overrides * Remove --config=local after BuildBuddy toolchain update BuildBuddy toolchain removed the default registration of its remote execution platform, so it no longer interferes with local builds, see buildbuddy-io/buildbuddy-toolchain@96323fd --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andreas Herrmann <[email protected]>
aherrmann · Dec 7, 2024 · 5ad4e83 · 5ad4e83
1 parent 74b15ca
commit 5ad4e83
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 24 deletions.
diff --git a/.bazelrc.remote b/.bazelrc.remote
@@ -48,6 +48,3 @@ build:remote-exec --jobs=80
 build:remote-exec --extra_execution_platforms=@buildbuddy_toolchain//:platform
 # docs: https://bazel.build/reference/command-line-reference#flag--extra_toolchains
 build:remote-exec --extra_toolchains=@buildbuddy_toolchain//:cc_toolchain
-# prefer host platform on non-remote builds
-# docs: https://bazel.build/reference/command-line-reference#flag--extra_execution_platforms
-build:local --extra_execution_platforms=@local_config_platform//:host
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,12 +9,6 @@ build --config=remote
 build --remote_header=x-buildbuddy-api-key=YOUR_TOKEN
 ```
 
-To build locally instead, add the following to `.bazelrc.user`:
-
-```
-build --config=local
-```
-
 Build and test:
 
 ```

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -29,9 +29,9 @@ zig_dev.toolchain(zig_version = "0.11.0")
 bazel_dep(name = "toolchains_buildbuddy", dev_dependency = True)
 archive_override(
     module_name = "toolchains_buildbuddy",
-    integrity = "sha256-HupO9xeeYDAybxZiXmUFk6W5bAlNnM3c2e8cwkutEpc=",
-    strip_prefix = "buildbuddy-toolchain-eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9",
-    urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9.tar.gz",
+    integrity = "sha256-UA+poYaWFbPxgtoA2re4mX89c3/8yYchpKwr4pvvGOw=",
+    strip_prefix = "buildbuddy-toolchain-ffd296b7a9821174cdb2188d1373fd262cacb09d",
+    urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/ffd296b7a9821174cdb2188d1373fd262cacb09d.tar.gz",
 )
 
 buildbuddy = use_extension(

diff --git a/e2e/workspace/MODULE.bazel b/e2e/workspace/MODULE.bazel
@@ -23,9 +23,9 @@ use_repo(zig, "zig_toolchains")
 bazel_dep(name = "toolchains_buildbuddy", dev_dependency = True)
 archive_override(
     module_name = "toolchains_buildbuddy",
-    integrity = "sha256-HupO9xeeYDAybxZiXmUFk6W5bAlNnM3c2e8cwkutEpc=",
-    strip_prefix = "buildbuddy-toolchain-eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9",
-    urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9.tar.gz",
+    integrity = "sha256-UA+poYaWFbPxgtoA2re4mX89c3/8yYchpKwr4pvvGOw=",
+    strip_prefix = "buildbuddy-toolchain-ffd296b7a9821174cdb2188d1373fd262cacb09d",
+    urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/ffd296b7a9821174cdb2188d1373fd262cacb09d.tar.gz",
 )
 
 buildbuddy = use_extension(

diff --git a/e2e/workspace/WORKSPACE.bazel b/e2e/workspace/WORKSPACE.bazel
@@ -31,9 +31,9 @@ aspect_bazel_lib_register_toolchains()
 
 http_archive(
     name = "io_buildbuddy_buildbuddy_toolchain",
-    sha256 = "b984cc2c22883626584643b34692a56a8a6cacb02bc4c5a0f1fcb2167ebecb82",
-    strip_prefix = "buildbuddy-toolchain-96323fd34cc72aacaad28d0e60489f64521c9eb6",
-    urls = ["https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/96323fd34cc72aacaad28d0e60489f64521c9eb6.tar.gz"],
+    sha256 = "500fa9a1869615b3f182da00dab7b8997f3d737ffcc98721a4ac2be29bef18ec",
+    strip_prefix = "buildbuddy-toolchain-ffd296b7a9821174cdb2188d1373fd262cacb09d",
+    urls = ["https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/ffd296b7a9821174cdb2188d1373fd262cacb09d.tar.gz"],
 )
 
 load("@io_buildbuddy_buildbuddy_toolchain//:deps.bzl", "buildbuddy_deps")

diff --git a/internal_deps.bzl b/internal_deps.bzl
@@ -27,9 +27,9 @@ def rules_zig_internal_deps():
 
     http_archive(
         name = "io_buildbuddy_buildbuddy_toolchain",
-        sha256 = "b984cc2c22883626584643b34692a56a8a6cacb02bc4c5a0f1fcb2167ebecb82",
-        strip_prefix = "buildbuddy-toolchain-96323fd34cc72aacaad28d0e60489f64521c9eb6",
-        urls = ["https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/96323fd34cc72aacaad28d0e60489f64521c9eb6.tar.gz"],
+        sha256 = "500fa9a1869615b3f182da00dab7b8997f3d737ffcc98721a4ac2be29bef18ec",
+        strip_prefix = "buildbuddy-toolchain-ffd296b7a9821174cdb2188d1373fd262cacb09d",
+        urls = ["https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/ffd296b7a9821174cdb2188d1373fd262cacb09d.tar.gz"],
     )
 
     http_archive(

diff --git a/zig/tests/integration_tests/workspace/MODULE.bazel b/zig/tests/integration_tests/workspace/MODULE.bazel
@@ -23,9 +23,9 @@ use_repo(zig, "zig_toolchains")
 bazel_dep(name = "toolchains_buildbuddy", dev_dependency = True)
 archive_override(
     module_name = "toolchains_buildbuddy",
-    integrity = "sha256-HupO9xeeYDAybxZiXmUFk6W5bAlNnM3c2e8cwkutEpc=",
-    strip_prefix = "buildbuddy-toolchain-eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9",
-    urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9.tar.gz",
+    integrity = "sha256-UA+poYaWFbPxgtoA2re4mX89c3/8yYchpKwr4pvvGOw=",
+    strip_prefix = "buildbuddy-toolchain-ffd296b7a9821174cdb2188d1373fd262cacb09d",
+    urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/ffd296b7a9821174cdb2188d1373fd262cacb09d.tar.gz",
 )
 
 buildbuddy = use_extension(