bootstrap: don't use --merges to look for commit hashes for downloading artifacts
#89655
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
Shallow clones can cause `git rev-list --merges` to miss merge commits. Omit it, because the most recent bors commit is almost always a merge commit.
Exit with an error if we can't find a commit hash for downloading LLVM or rustc snapshots.
|
@bors r+ rollup |
|
📌 Commit 8e46742 has been approved by |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 11, 2021
bootstrap: don't use `--merges` to look for commit hashes for downloading artifacts Shallow clones (and possibly worktrees, though I can't seem to reproduce the problem there) can cause `git rev-list --merges` to falsely return no results, even if a merge commit is present. Stop using the `--merges` option when looking for commit hashes that have build artifacts. `--first-parent` and `--author=bors@rust-lang.org` should be sufficient. Also exit with an error if the configuration asks for artifacts to be downloaded and we can't determine an appropriate commit hash to use to download artifacts. Fixes rust-lang#87890. r? `@jyn514` `@rustbot` label +A-rustbuild +A-contributor-roadblock
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 11, 2021
…laumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#89655 (bootstrap: don't use `--merges` to look for commit hashes for downloading artifacts) - rust-lang#89726 (Add #[must_use] to alloc constructors) - rust-lang#89729 (Add #[must_use] to core and std constructors) - rust-lang#89743 (Fix RUSTC_LOG handling) - rust-lang#89753 (Add #[must_use] to from_value conversions) - rust-lang#89754 (Cleanup .item-table CSS) - rust-lang#89761 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Shallow clones (and possibly worktrees, though I can't seem to reproduce the problem there) can cause
git rev-list --mergesto falsely return no results, even if a merge commit is present. Stop using the--mergesoption when looking for commit hashes that have build artifacts.--first-parentand--author=bors@rust-lang.orgshould be sufficient.Also exit with an error if the configuration asks for artifacts to be downloaded and we can't determine an appropriate commit hash to use to download artifacts.
Fixes #87890.
r? @jyn514
@rustbot label +A-rustbuild +A-contributor-roadblock