Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bazelisk past v1.21.0 #8119

Merged
merged 4 commits into from
Jan 23, 2025
Merged

Update bazelisk past v1.21.0 #8119

merged 4 commits into from
Jan 23, 2025

Conversation

bduffany
Copy link
Member

@bduffany bduffany commented Jan 6, 2025

Context: the PR https://github.com/buildbuddy-io/buildbuddy/pull/8086/files originally wanted to bump bazelisk to v1.21.0, but there were some breakages relating to bazelisk renaming their go dependencies' repository names internally.

The original PR attempted to work around that renaming issue by using repo_mapping, but we had some issues getting it to work.

So, we're instead now reverting Gazelle's repo renaming change by upgrading our bazelisk dep to the pseudo-version at bazelbuild/bazelisk@0a4dc6b . This should address the original need for upgrading to v1.21.0 as it should have the latest bazelisk changes.

(Small note, this PR also bumps the bazelisk binaries downloaded with http_file to the latest released version, just to keep the CLI bazelisk version and ci_runner bundled bazelisk version reasonably close.)

@fmeum
Copy link
Contributor

fmeum commented Jan 7, 2025

If you update to the pseudo-version corresponding to bazelbuild/bazelisk@0a4dc6b, the repo names should be correct for both WORKSPACE and Bzlmod without the need for repo_mapping.

@keith
Copy link
Contributor

keith commented Jan 22, 2025

rebased version #8232

@bduffany bduffany changed the title Update bazelisk to v1.21.0 Update bazelisk past v1.21.0 Jan 23, 2025
@bduffany
Copy link
Member Author

@keith sorry for the delay on this PR - I had to make a few more changes to it, pulling in Fabian's upstream fix in bazelisk + dealing with a few other breaking changes, but we should be good to go now. The PR now upgrades us a little past v1.25.0 (bazelbuild/bazelisk@0a4dc6b)

@keith
Copy link
Contributor

keith commented Jan 23, 2025

np, thanks!

@bduffany bduffany merged commit d513ce8 into master Jan 23, 2025
14 of 15 checks passed
@bduffany bduffany deleted the bazelisk-1.21.0 branch January 23, 2025 02:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants