Merge pull request #200676 from Homebrew/bump-bazelisk-1.25.0

bazelisk 1.25.0
Homebrew · Dec 10, 2024 · 3072aa3 · 3072aa3
2 parents 4bd3fa8 + 3d42d6c
commit 3072aa3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 40 deletions.
diff --git a/Formula/b/bazelisk.rb b/Formula/b/bazelisk.rb
@@ -1,18 +1,18 @@
 class Bazelisk < Formula
   desc "User-friendly launcher for Bazel"
   homepage "https://github.com/bazelbuild/bazelisk/"
-  url "https://github.com/bazelbuild/bazelisk/archive/refs/tags/v1.24.1.tar.gz"
-  sha256 "c7a44600ae88732fd75d8cbd1d58efe69610e41540566ff4102c5e3b96e497a7"
+  url "https://github.com/bazelbuild/bazelisk/archive/refs/tags/v1.25.0.tar.gz"
+  sha256 "8ff4c6b9ab6a00fbef351d52fde39afc2b9f047865f219a89ed0b23ad6f8cf06"
   license "Apache-2.0"
   head "https://github.com/bazelbuild/bazelisk.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any_skip_relocation, arm64_sequoia: "e0bae555199c22e743265ddbceacfdb1b02eb95219524bc8725fee548f0cce34"
-    sha256 cellar: :any_skip_relocation, arm64_sonoma:  "e0bae555199c22e743265ddbceacfdb1b02eb95219524bc8725fee548f0cce34"
-    sha256 cellar: :any_skip_relocation, arm64_ventura: "e0bae555199c22e743265ddbceacfdb1b02eb95219524bc8725fee548f0cce34"
-    sha256 cellar: :any_skip_relocation, sonoma:        "58d895bc81f10a256160bc6b15a5681408cc74c12da4674d2f1f2b9214d03b8b"
-    sha256 cellar: :any_skip_relocation, ventura:       "58d895bc81f10a256160bc6b15a5681408cc74c12da4674d2f1f2b9214d03b8b"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "c9349dc52707a43f29c61cf1f6eab004a6f10f9e8a214044933b9e81a88e9989"
+    sha256 cellar: :any_skip_relocation, arm64_sequoia: "1d565925eab24c61cc0f0c39730709eedb9bda9400066c085b21c499f6edd0dc"
+    sha256 cellar: :any_skip_relocation, arm64_sonoma:  "1d565925eab24c61cc0f0c39730709eedb9bda9400066c085b21c499f6edd0dc"
+    sha256 cellar: :any_skip_relocation, arm64_ventura: "1d565925eab24c61cc0f0c39730709eedb9bda9400066c085b21c499f6edd0dc"
+    sha256 cellar: :any_skip_relocation, sonoma:        "c110fa9b4817650ec875cd2cbac9f5463be023bdb2eadb5f7f721e079aba73f6"
+    sha256 cellar: :any_skip_relocation, ventura:       "c110fa9b4817650ec875cd2cbac9f5463be023bdb2eadb5f7f721e079aba73f6"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "750d4a82e5cd69c786226cfaff23eb3b7331629c5cdb6b3bd396258da62f5295"
   end
 
   depends_on "go" => :build

diff --git a/Formula/i/ibazel.rb b/Formula/i/ibazel.rb
@@ -6,14 +6,13 @@ class Ibazel < Formula
   license "Apache-2.0"
 
   bottle do
-    sha256 cellar: :any_skip_relocation, arm64_sequoia:  "0205534d6a69777bc71584978ec7c5d8dff4dc16827e3e4fef4b3757f427334c"
-    sha256 cellar: :any_skip_relocation, arm64_sonoma:   "5a6a3d2eaa8749318a9a9149d34bf01bed82aa3a32664c7cfac0536d2a44f250"
-    sha256 cellar: :any_skip_relocation, arm64_ventura:  "99edde73148166f0f1738662507a13738df09f301322e2297b8e9e7c5ffaa88e"
-    sha256 cellar: :any_skip_relocation, arm64_monterey: "de1b88603188daf5036f5e5ada068d962c270fcca96baf2cd291d0efdb4057bb"
-    sha256 cellar: :any_skip_relocation, sonoma:         "993c286e8f3e90429297e8d00ba069ae23e1a9ab9f5aafcec0a74bd2d0da7e60"
-    sha256 cellar: :any_skip_relocation, ventura:        "e25598ecd6f211262b59640362024ea38f84b2a9cde86dd541aaea9ef030690a"
-    sha256 cellar: :any_skip_relocation, monterey:       "cbb955a9601fc9bfe2f7ff6091488e457262466e67f7f0e01a1d7fe3b8a50f48"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "d66f94440f2ec1b6fef9b11e46776c2654b61b8c648ac8b6d275e4f0aebedf49"
+    rebuild 1
+    sha256 cellar: :any_skip_relocation, arm64_sequoia: "2c12651e6c9cbc680f6e787336fc2f2af53ccdd09cc7fafc8ee27a9317f507df"
+    sha256 cellar: :any_skip_relocation, arm64_sonoma:  "2c12651e6c9cbc680f6e787336fc2f2af53ccdd09cc7fafc8ee27a9317f507df"
+    sha256 cellar: :any_skip_relocation, arm64_ventura: "3244d3623fc940b32da49370e3b4d78edae09fa66fc336a80dc5a2a6bfca08d1"
+    sha256 cellar: :any_skip_relocation, sonoma:        "a2a7ca0a10912f7e99064fa84f76e4c05a0d1e1aefc026572187c66064872f37"
+    sha256 cellar: :any_skip_relocation, ventura:       "74d628872158223d2254232f97bc08654db611958b4269ed5b60aa91d8c3ec50"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "1dd9fbcb138b56677b3123f7194cb5d13675a5cdd6f8dcfd9a41f218b3b67828"
   end
 
   depends_on "bazelisk" => [:build, :test]
@@ -29,25 +28,26 @@ def install
   end
 
   test do
-    # Test building a sample Go program
-    (testpath/"WORKSPACE").write <<~EOS
-      load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+    # Write MODULE.bazel with Bazel module dependencies
+    (testpath/"MODULE.bazel").write <<~BAZEL
+      bazel_dep(name = "rules_go", version = "0.50.1")
+      bazel_dep(name = "gazelle", version = "0.40.0")
 
-      http_archive(
-        name = "io_bazel_rules_go",
-        sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
-            "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
-        ],
-      )
+      # Register the Go SDK extension properly
+      go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
 
-      load("@io_bazel_rules_go//go:deps.bzl", "go_host_sdk", "go_rules_dependencies")
+      # Register the Go SDK installed on the host.
+      go_sdk.host()
+    BAZEL
 
-      go_rules_dependencies()
+    (testpath/"BUILD.bazel").write <<~BAZEL
+      load("@rules_go//go:def.bzl", "go_binary")
 
-      go_host_sdk(name = "go_sdk")
-    EOS
+      go_binary(
+          name = "bazel-test",
+          srcs = ["test.go"],
+      )
+    BAZEL
 
     (testpath/"test.go").write <<~GO
       package main
@@ -57,15 +57,6 @@ def install
       }
     GO
 
-    (testpath/"BUILD").write <<~EOS
-      load("@io_bazel_rules_go//go:def.bzl", "go_binary")
-
-      go_binary(
-        name = "bazel-test",
-        srcs = glob(["*.go"])
-      )
-    EOS
-
     pid = fork { exec("ibazel", "build", "//:bazel-test") }
     out_file = "bazel-bin/bazel-test_/bazel-test"
     sleep 1 until File.exist?(out_file)