Skip to content
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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix artifact version/channel detection for stable #103878

Merged
merged 1 commit into from
Nov 5, 2022

Conversation

Mark-Simulacrum
Copy link
Member

On stable, our artifacts are uploaded with the raw version number (e.g., 1.65.0), not the channel. This adjusts our detection logic to use the version number from src/version when we detect the stable channel.

This is really only important for stable channel re-builds, I think, but those do happen from time to time. I'm backporting a similar commit in #103859 to make that PR pass CI.

@rustbot
Copy link
Collaborator

rustbot commented Nov 2, 2022

r? @jyn514

(rustbot has picked a reviewer for you, use r? to override)

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

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It makes sense to me that this is needed, just a couple comments on the implementation.

src/bootstrap/config.rs Show resolved Hide resolved
src/bootstrap/config.rs Outdated Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

On stable, our artifacts are uploaded with the raw version number (e.g.,
1.65.0), not the channel. This adjusts our detection logic to use the
version number from src/version when we detect the stable channel.
@Mark-Simulacrum
Copy link
Member Author

Ready for another review.

@jyn514
Copy link
Member

jyn514 commented Nov 3, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Nov 3, 2022

📌 Commit 2949009 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 Nov 3, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 5, 2022
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#103868 (Use `TraitEngine` (by itself) less)
 - rust-lang#103878 (Fix artifact version/channel detection for stable)
 - rust-lang#103946 (Cleanup bind_pattern args)
 - rust-lang#103956 (Make mir opt unused file check blessable)
 - rust-lang#103977 (LLVM 16: Switch to using MemoryEffects)
 - rust-lang#103980 (rustdoc: simplify search results CSS and DOM)
 - rust-lang#103984 (Refactor tcx mk_const parameters.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 68c8d6d into rust-lang:master Nov 5, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants