fix download-llvm logic for subtree sync branches by RalfJung · Pull Request #137593 · rust-lang/rust (original) (raw)
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation13 Commits1 Checks6 Files changed
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
[ Show hidden characters]({{ revealButtonHref }})
rustbot added S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
labels
📌 Commit 88f14a8 has been approved by Mark-Simulacrum
It is now in the queue for this repository.
bors added S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
This change partially merged in #137594, weird.
bors added S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
I have updated the PR based on what I found here. I still think we shouldn't even try to look at the history when we know that basically none of the history has even been fetched, but that's a much larger change I will not undertake. I hope (and confirmed to the extent that I can, by playing with git log
in a sparse checkout) this change now both fixes the issue I am running into and keeps CI working.
@rustbot ready
rustbot added S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
r=me if we didn't need to revert this somewhere (I seem to vaguely recall that happening somewhere)
We had to revert an earlier version of this. So I went for a different approach now, which should fix that issue.
@bors r=Mark-Simulacrum
📌 Commit 0ee9456 has been approved by Mark-Simulacrum
It is now in the queue for this repository.
bors added S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
bors added a commit to rust-lang-ci/rust that referenced this pull request
Rollup of 10 pull requests
Successful merges:
- rust-lang#137593 (fix download-llvm logic for subtree sync branches)
- rust-lang#137736 (Don't attempt to export compiler-builtins symbols from rust dylibs)
- rust-lang#138135 (Simplify
PartialOrd
on tuples containing primitives) - rust-lang#138321 ([bootstrap] Distribute split debuginfo if present)
- rust-lang#138574 (rustdoc: be more strict about "Methods from Deref")
- rust-lang#138606 (Fix missing rustfmt in msi installer - cont)
- rust-lang#138671 (Fix
FileType
PartialEq
implementation on Windows) - rust-lang#138728 (Update
compiler-builtins
to 0.1.152) - rust-lang#138783 (Cache current_dll_path output)
- rust-lang#138846 (Tweaks to writeback and
Obligation -> Goal
conversion)
Failed merges:
- rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
r? @ghost
@rustbot
modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request
Rollup merge of rust-lang#137593 - RalfJung:subtree-sync-download-llvm, r=Mark-Simulacrum
fix download-llvm logic for subtree sync branches
Fixes rust-lang#101907
Cc @onur-ozkan
r? @Mark-Simulacrum
It's like the rev-list
args is somehow wrong because the rustc-perf log output has
usage: git rev-list [OPTION] <commit-id>... [ -- paths... ]
limiting output:
--max-count=<n>
--max-age=<epoch>
--min-age=<epoch>
--sparse
--no-merges
--min-parents=<n>
--no-min-parents
--max-parents=<n>
--no-max-parents
--remove-empty
--all
--branches
--tags
--remotes
--stdin
--quiet
ordering output:
--topo-order
--date-order
--reverse
formatting output:
--parents
--children
--objects | --objects-edge
--unpacked
--header | --pretty
--abbrev=<n> | --no-abbrev
--abbrev-commit
--left-right
--count
special purpose:
--bisect
--bisect-vars
--bisect-all
Comment on lines -157 to +165
"--first-parent", |
---|
"--diff-merges=first-parent", |
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think --diff-merges
is a git show
-only flag, not git rev-list
.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried it locally and it works for git rev-list
as well.
$ git --version
git version 2.47.2
jieyouxu added a commit to jieyouxu/rust that referenced this pull request
…load-llvm, r=Mark-Simulacrum"
Looks like unfortunately the --diff-merges
flag is a git show
-only
command, not git rev-list
.
This reverts commit 95994f9, reversing changes made to 7290b04.
bors added a commit to rust-lang-ci/rust that referenced this pull request
I posted a revert #138878 to fix perf, because I know nothing about the distinction between these two flags, so a fix-forward seems also risky.
bors added a commit to rust-lang-ci/rust that referenced this pull request
RalfJung deleted the subtree-sync-download-llvm branch
Labels
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)