backport #513 #520
Merged
backport #513 #520
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
Note that this commit should not be merged into master. It's only relevant for the x86_64-0.14.x branch. This commit should not change the behavior of CI on the master branch.
A recent nightly changed the signature of Step::steps_between to match the signature of Iterator::size_hint. This patch changes our implementations to match the new signature.
Starting with the latest nightly, this results in an error: error: avoid using labels containing only the digits `0` and `1` in inline assembly --> src/instructions/segmentation.rs:81:18 | 81 | "1:", | ^ use a different label that doesn't start with `0` or `1` | = note: an LLVM bug makes these labels ambiguous with a binary literal number = note: `#[deny(binary_asm_labels)]` on by default
Freax13
force-pushed
the
backport/pr-513
branch
from
5f4dced to
7e4534b
Compare
|
I had to update the allowed branches for the environment secret, but other than that it seems to have worked perfectly. |
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.
We need to backport #513 to v0.14 because there are a lot of people still depending on v0.14 and it's currently broken on nightly.
I created a new branch
x86_64-0.14.xto use for backporting fixes. This branch currently points at the commit that released v0.14.12 (the last commit before we started merging v0.15 stuff into master). I enabled branch protections on this new branch. This PR targets that new branch.The first commit in this PR adjusts CI to run on the new branch so that our CI pipeline can create the release.
For the second commit, I cherry-picked b9e3d25. This commit contains the fixes for newer nightlies. For the third commit, I cherry-picked 3fec974 to fix a deny-by-default warning. Note that this PR doesn't backport any other fixes.
The last two commits prepare a new release.