CI: Set -Crelocation-model=static in RUSTFLAGS for bootloader test job
#480
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
In d3b9c05, we switched our test framework to the built-in x86_64-unknown-none target. This required a `-Crelocation-model=static` flag to work with bootloader v0.9, which we set using a `build.rustflags` config key. In 2eb838d, we set a `RUSTFLAGS` env variable on CI to deny warnings. Unfortunately, the above two commits conflict because the `RUSTFLAGS` env variable takes precedence over the `build.rustflags` key. This commit fixes this by setting an explicit `RUSTFLAGS` value for the bootloader test job that contains both flags.
mkroening
approved these changes
Apr 8, 2024
There was a problem hiding this comment.
Looks good to me. 👍
Merge queues would have prevented this. Maybe we should consider enabling them?
|
Enabling merge queues is a good idea! However, the "Bootloader Integration Test" job is not marked as required, so merge queues wouldn't have helped here. The reason for keeping the bootloader integration test jobs optional is to avoid deadlock situations on nightly breakage. There is a circular dependency because the |
|
Ah, that makes sense. :) |
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.
In d3b9c05, we switched our test framework to the built-in x86_64-unknown-none target. This required a
-Crelocation-model=staticflag to work with bootloader v0.9, which we set using abuild.rustflagsconfig key.In 2eb838d, we set a
RUSTFLAGSenv variable on CI to deny warnings.Unfortunately, the above two commits conflict because the
RUSTFLAGSenv variable takes precedence over thebuild.rustflagskey. This commit fixes this by setting an explicitRUSTFLAGSvalue for the bootloader test job that contains both flags.This should fix the CI build errors.