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

bootstrap PGO artifact copies broken #113784

Closed
Mark-Simulacrum opened this issue Jul 17, 2023 · 2 comments
Closed

bootstrap PGO artifact copies broken #113784

Mark-Simulacrum opened this issue Jul 17, 2023 · 2 comments
Labels
regression-from-stable-to-beta Performance or correctness regression from stable to beta. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Milestone

Comments

@Mark-Simulacrum
Copy link
Member

It looks like at least the old Python script hardcoded the channel as "nightly", which won't work on beta and stable branches.

27ff819 fixed this for last week's promotion from master -> beta, but it won't work on beta -> stable as that has yet another format.

We probably want to mirror the logic here: https://github.com/rust-lang/promote-release/blob/348f02569e3aff02187e90bbf532e63ccf62a268/src/main.rs#L451-L458, specifically the version part.

I think we'll want to land a commit on beta with the fix targeting stable, and a separate one on master -- given we just rewrote the script to Rust I'm not sure trying to backport something makes much sense. If the beta commit is tricky for some reason, we can skip that and just hardcode the version when running the next beta -> stable promotion.

cc @Kobzol -- maybe you can help work on this.

@Mark-Simulacrum Mark-Simulacrum added regression-from-stable-to-beta Performance or correctness regression from stable to beta. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 17, 2023
@rustbot rustbot added I-prioritize Issue: Indicates that prioritization has been requested for this issue. needs-triage This issue may need triage. Remove it if it has been sufficiently triaged. labels Jul 17, 2023
@Mark-Simulacrum Mark-Simulacrum removed I-prioritize Issue: Indicates that prioritization has been requested for this issue. needs-triage This issue may need triage. Remove it if it has been sufficiently triaged. labels Jul 17, 2023
@Mark-Simulacrum Mark-Simulacrum added this to the 1.72.0 milestone Jul 17, 2023
@Kobzol
Copy link
Contributor

Kobzol commented Jul 17, 2023

Maybe the simplest solution would just be to look up these files by their prefix? (We can also ignore the tests for beta/stable releases, but it probably is highly valuable to run these tests for them).

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this issue Jul 31, 2023
…mulacrum

Resolve correct archive version name in `opt-dist`

Should resolve the master part of rust-lang#113784.

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this issue Aug 1, 2023
…-Simulacrum

Disable dist tests on beta/stable

Should resolve the beta/stable part of rust-lang#113784. To be extra safe, I also made the read of `RUST_RELEASE_CHANNEL` optional, just in case it was missing.

r? `@Mark-Simulacrum`
github-actions bot pushed a commit to rust-lang/miri that referenced this issue Aug 2, 2023
Resolve correct archive version name in `opt-dist`

Should resolve the master part of rust-lang/rust#113784.

r? `@Mark-Simulacrum`
@Mark-Simulacrum
Copy link
Member Author

I think the above two PRs should have fixed this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
regression-from-stable-to-beta Performance or correctness regression from stable to beta. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

No branches or pull requests

3 participants