Cherry-pick to earlgrey_1.0.0: [bazel] Update Bazel to version 7.3.1 #25600
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
jwnrt
approved these changes
Dec 11, 2024
Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 317128f)
We were previously taking these from the Bazel repository at the version we were using. This has broken, but Bazel has a documented way of doing this now independent of version: https://bazel.build/run/build#repository_cache_with_bazel_7_or_later Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 75af583)
Bazel 7 does not like a rule which outputs a directory _and_ something from that directory's contents. This commit removes the build directory from the outputs and exposes only those requested by `output_groups`. The paths should stay the same. Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit f534cb7)
Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 6826e0a)
Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit bd85187)
This release includes a fix for Bazel 7 that we need. Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 64273af)
When we build our C files for `bindgen` to consume, we use the `host` configuration. The `--features` flag is no longer applied to `host` in Bazel 7, so we must add this extra flag. Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 6c694df)
Even though we're not using these, Bazel 7 hits errors if we try to run `bazel query deps($something)` on a Rust dependency. Fixed in `rules_rust>=0.38.0`. bazelbuild/rules_rust#1166 (comment) Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit f9f257a)
Required for bzlmod support. Older versions do not recognise `MODULE.bazel` as the root of the repo when searching for `.bazelversion`. Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 573cb6e)
Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 36fe045)
This container pre-downloads Bazelisk for some reason, and the version does not match what we're downloading in `bazelisk.sh`. This old version is broken. Updating will fix the website build. Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 6460129)
jwnrt
force-pushed
the
backport-24392-to-earlgrey_1.0.0
branch
from
ae64d82 to
80d9425
Compare
The `bazelisk.sh` script will try to use a real Bazel from the `PATH` if it can find it, but doesn't check its value against `.bazelversion`. This change checks the version and falls back to downloading `bazelisk` if it doesn't match. Signed-off-by: James Wainwright <james.wainwright@lowrisc.org> (cherry picked from commit 68f74f7)
|
Also had to include this PR: Also, there have been some persistent FPGA failures in CI which I can't reproduce locally. Hesitate to class them as flaky though because I can't immediately see them failing in other PRs. Strange. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic cherry-pick of #24392 to branch
earlgrey_1.0.0.