adjust josh pushing, remove './miri toolchain HEAD/commit' #2667
Conversation
This file contains hidden or 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
RalfJung
changed the title
RalfJung
changed the title
|
In fact we probably want |
|
@bors r+ |
|
☀️ Test successful - checks-actions |
RalfJung
pushed a commit
to RalfJung/miri
that referenced
this pull request
Nov 17, 2022
adjust josh pushing, remove './miri toolchain HEAD/commit' Looks like pushing works much better if we use as base commit the last commit we pulled from rustc and merged into Miri. Which I guess is fair. Conveniently, the `rust-version` file should usually be pretty much exactly that commit. Also adjust `rustc-pull` to update that file. Pulling is now the way to update to a newer rustc, so I also removed `./miri toolchain HEAD`.
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.
Looks like pushing works much better if we use as base commit the last commit we pulled from rustc and merged into Miri. Which I guess is fair. Conveniently, the
rust-versionfile should usually be pretty much exactly that commit. Also adjustrustc-pullto update that file.Pulling is now the way to update to a newer rustc, so I also removed
./miri toolchain HEAD.