Skip to content

Discover channel for LLVM download #99962

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 30, 2022
Merged

Discover channel for LLVM download #99962

merged 1 commit into from
Jul 30, 2022
+13 −6

Conversation

Mark-Simulacrum
Copy link
Member

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 30, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2022
@jyn514
Copy link
Member

jyn514 commented Jul 30, 2022

👍 this makes sense to me. Can you also fix this for download-rustc at the same time?

rust/src/bootstrap/config.rs

Lines 1548 to 1551 in e33cc71

fn download_ci_rustc(builder: &Builder<'_>, commit: &str) {
builder.verbose(&format!("using downloaded stage2 artifacts from CI (commit {commit})"));
// FIXME: support downloading artifacts from the beta channel
const CHANNEL: &str = "nightly";

@jyn514 jyn514 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 30, 2022
@Mark-Simulacrum Mark-Simulacrum force-pushed the detect-ci-artifact-channel branch from db22b8b to a93d1cb Compare July 30, 2022 19:57
@Mark-Simulacrum
Discover channel for artifact download
d63e982 
When we're downloading based on a CI commit, that can still be -beta- or even
-stable-, so we should lookup the channel it was built with.
@Mark-Simulacrum Mark-Simulacrum force-pushed the detect-ci-artifact-channel branch from a93d1cb to d63e982 Compare July 30, 2022 19:59
@Mark-Simulacrum
Copy link
Member Author

Ah, I looked for other cases but the "helpful" constant made it hard to find it. (Not just -nightly-).

@rustbot ready

@rustbot 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 Jul 30, 2022
@jyn514
Copy link
Member

jyn514 commented Jul 30, 2022

@bors r+ rollup

Thanks!

@bors
Copy link
Collaborator

bors commented Jul 30, 2022

📌 Commit d63e982 has been approved by jyn514

It is now in the queue for this repository.

@bors 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 Jul 30, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 30, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 30, 2022
@bors
Auto merge of rust-lang#99964 - matthiaskrgr:rollup-jr836e2, r=matthi…
0f4bcad 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#99650 (Support `x --keep-stage 0 check`)
 - rust-lang#99873 (rustdoc: align invalid-html-tags lint with commonmark spec)
 - rust-lang#99889 (Remove `parent_pat` from `TopInfo`)
 - rust-lang#99890 (Do not allow bad projection term to leak into the type checker)
 - rust-lang#99937 (Reset directory iteration in remove_dir_all)
 - rust-lang#99950 (Remove more Clean trait implementations)
 - rust-lang#99956 (Also gate AllocatedPointer and AllocAlign definitions by LLVM_VERSION_GE)
 - rust-lang#99962 (Discover channel for LLVM download)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f21a06f into rust-lang:master Jul 30, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jyn514 jyn514

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Mark-Simulacrum @jyn514 @bors @rust-highfive @rustbot