Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion third_party/com_github_bazelbuild_bazelisk/bazelisk.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def determine_url(version, is_commit, bazel_filename):

bazelisk_base_url = get_env_or_config("BAZELISK_BASE_URL")
if bazelisk_base_url is not None:
return "{}/{}/{}".format(bazelisk_base_url, version, bazel_filename)
return "{}/{}{}/{}".format(bazelisk_base_url, version, rc if rc else "", bazel_filename)
else:
return "https://releases.bazel.build/{}/{}/{}".format(
version, rc if rc else "release", bazel_filename
Expand Down
24 changes: 24 additions & 0 deletions tools/workspace/bazelisk_internal/patches/upstream/pr722.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 488f57f44a4624a7fb4f7f329120e688e90e6ac3 Mon Sep 17 00:00:00 2001
From: chua <[email protected]>
Date: Thu, 11 Sep 2025 09:36:20 +0000
Subject: [PATCH] make release candidate versions handling on BAZELISK_BASE_URL

Make this more consistent with the github.com release urls, for simpler mirrors.
This is a non-backwards compatible change, so we may want to introduce a new ENV var to prevent breakages with existing setups that are working.
---
bazelisk.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bazelisk.py b/bazelisk.py
index 5de6effb..bab7638a 100755
--- bazelisk.py
+++ bazelisk.py
@@ -324,7 +324,7 @@ def determine_url(version, is_commit, bazel_filename):

bazelisk_base_url = get_env_or_config("BAZELISK_BASE_URL")
if bazelisk_base_url is not None:
- return "{}/{}/{}".format(bazelisk_base_url, version, bazel_filename)
+ return "{}/{}{}/{}".format(bazelisk_base_url, version, rc if rc else "", bazel_filename)
else:
return "https://releases.bazel.build/{}/{}/{}".format(
version, rc if rc else "release", bazel_filename
3 changes: 3 additions & 0 deletions tools/workspace/bazelisk_internal/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@ def bazelisk_internal_repository(
commit = "v1.27.0",
sha256 = "d4abfac1a39876ec1e6c6fa04ec0b62cc4bef174f11d19848bc80dc15ee05261", # noqa
build_file = ":package.BUILD.bazel",
patches = [
":patches/upstream/pr722.patch",
],
mirrors = mirrors,
)