[DO NOT MERGE][BETA] What does compiletest see in opt-dist? by jieyouxu · Pull Request #134131 · rust-lang/rust

jieyouxu · 2024-12-10T14:02:52Z

Does try jobs even work against beta...?

try-job: dist-x86_64-linux

jieyouxu · 2024-12-10T14:06:44Z

[DO NOT MERGE][BETA] What does compiletest see in opt-dist? Does try jobs even work against beta...? r? `@ghost` try-job: dist-x86_64-linux

bors · 2024-12-10T14:07:58Z

⌛ Trying commit 748a676 with merge b2a805a...

bors · 2024-12-10T16:14:53Z

💔 Test failed - checks-actions

jieyouxu · 2024-12-10T16:18:37Z

INFO: compiletest was told channel=`nightly`
INFO: rustc -vV reports:
rustc 1.84.0-beta.5 (b2a805af7 2024-12-10)
commit-hash: b2a805af7dda462123e2f557b0b9c5a2c9aedde6
commit-date: 2024-12-10
host: x86_64-unknown-linux-gnu
release: 1.84.0-beta.5

I can see why that might be a problem

jieyouxu · 2024-12-19T13:41:14Z

@bors try

[DO NOT MERGE][BETA] What does compiletest see in opt-dist? Does try jobs even work against beta...? r? `@ghost` try-job: dist-x86_64-linux

bors · 2024-12-19T13:42:27Z

⌛ Trying commit 41d70a3 with merge 72fcca2...

jieyouxu · 2024-12-19T14:36:02Z

@bors r- retry (in case bors thinks this is not a try job)

jieyouxu · 2024-12-19T14:36:22Z

@bors r-

jieyouxu · 2024-12-19T15:22:12Z

@bors retry r- (sync)

jieyouxu · 2024-12-19T16:07:41Z

@bors try

bors · 2024-12-19T16:08:53Z

⌛ Trying commit 41d70a3 with merge 9bf85df...

[DO NOT MERGE][BETA] What does compiletest see in opt-dist? Does try jobs even work against beta...? r? `@ghost` try-job: dist-x86_64-linux

bors · 2024-12-19T18:16:59Z

☀️ Try build successful - checks-actions
Build commit: 9bf85df (9bf85df54bce422bf08cee0c34b54d1ef2a5155a)

jieyouxu · 2024-12-19T18:27:46Z

Ok cool.

… r=Kobzol opt-dist: propagate channel info to bootstrap Fixesrust-lang#133503. Previously, `tests/ui/bootstrap/rustc_bootstap.rs` [sic] failed during [beta bump](rust-lang#133447 (comment)) in opt-dist tests. This is because: - `opt-dist` tried to run `./x test` against beta-channel dist `rustc` through `bootstrap`. - The dist build produced during the beta bump produces a `rustc` which correctly thinks that it is a beta compiler based on `src/ci/channel` info. - `opt-dist` tries to run `./x test` on the beta `rustc` from the dist build, but without specifying channel through a synthetic `config.toml`, so `bootstrap` tells `compiletest` that we're on the `nightly` channel (by default). - Now there's a channel mismatch: `compiletest` believes the `rustc` under test is a *nightly* rustc, but the `rustc` under test actually considers itself a *beta* rustc. This means that `//@ only-nightly` will be satisfied yet the test will fail as the *beta* rustc is not a *nightly* rustc. This PR: - Fixes the test failure during beta bump (i.e. rust-lang#133503) by having `opt-dist` faithfully report the channel of the dist `rustc` being tested (i.e. "beta" in a beta bump PR). This will properly make the test be ignored during beta bump as the `rustc` under test is not a *nightly* rustc. - Fixes the test name `rustc_bootstap.rs` -> `rustc_bootstrap.rs`. No more stapping. - Slightly adjusts the doc comment in the test to make it more clear. I ran a try-job against the beta branch (explicitly running the opt-dist tests by modifying the job definition) with these changes in rust-lang#134131, and it appears that the try-job was [successful](rust-lang#134131 (comment)). The two commits in this PR are cherry-picked from rust-lang#134131, with the test commit slightly modified (to also adjust the test comments). r? `@Kobzol` (or compiler or bootstrap or infra I guess?)

Rollup merge of rust-lang#134528 - jieyouxu:fix-rustc-bootstrap-test, r=Kobzol opt-dist: propagate channel info to bootstrap Fixesrust-lang#133503. Previously, `tests/ui/bootstrap/rustc_bootstap.rs` [sic] failed during [beta bump](rust-lang#133447 (comment)) in opt-dist tests. This is because: - `opt-dist` tried to run `./x test` against beta-channel dist `rustc` through `bootstrap`. - The dist build produced during the beta bump produces a `rustc` which correctly thinks that it is a beta compiler based on `src/ci/channel` info. - `opt-dist` tries to run `./x test` on the beta `rustc` from the dist build, but without specifying channel through a synthetic `config.toml`, so `bootstrap` tells `compiletest` that we're on the `nightly` channel (by default). - Now there's a channel mismatch: `compiletest` believes the `rustc` under test is a *nightly* rustc, but the `rustc` under test actually considers itself a *beta* rustc. This means that `//@ only-nightly` will be satisfied yet the test will fail as the *beta* rustc is not a *nightly* rustc. This PR: - Fixes the test failure during beta bump (i.e. rust-lang#133503) by having `opt-dist` faithfully report the channel of the dist `rustc` being tested (i.e. "beta" in a beta bump PR). This will properly make the test be ignored during beta bump as the `rustc` under test is not a *nightly* rustc. - Fixes the test name `rustc_bootstap.rs` -> `rustc_bootstrap.rs`. No more stapping. - Slightly adjusts the doc comment in the test to make it more clear. I ran a try-job against the beta branch (explicitly running the opt-dist tests by modifying the job definition) with these changes in rust-lang#134131, and it appears that the try-job was [successful](rust-lang#134131 (comment)). The two commits in this PR are cherry-picked from rust-lang#134131, with the test commit slightly modified (to also adjust the test comments). r? `@Kobzol` (or compiler or bootstrap or infra I guess?)

opt-dist: propagate channel info to bootstrap Fixes #133503. Previously, `tests/ui/bootstrap/rustc_bootstap.rs` [sic] failed during [beta bump](rust-lang/rust#133447 (comment)) in opt-dist tests. This is because: - `opt-dist` tried to run `./x test` against beta-channel dist `rustc` through `bootstrap`. - The dist build produced during the beta bump produces a `rustc` which correctly thinks that it is a beta compiler based on `src/ci/channel` info. - `opt-dist` tries to run `./x test` on the beta `rustc` from the dist build, but without specifying channel through a synthetic `config.toml`, so `bootstrap` tells `compiletest` that we're on the `nightly` channel (by default). - Now there's a channel mismatch: `compiletest` believes the `rustc` under test is a *nightly* rustc, but the `rustc` under test actually considers itself a *beta* rustc. This means that `//@ only-nightly` will be satisfied yet the test will fail as the *beta* rustc is not a *nightly* rustc. This PR: - Fixes the test failure during beta bump (i.e. #133503) by having `opt-dist` faithfully report the channel of the dist `rustc` being tested (i.e. "beta" in a beta bump PR). This will properly make the test be ignored during beta bump as the `rustc` under test is not a *nightly* rustc. - Fixes the test name `rustc_bootstap.rs` -> `rustc_bootstrap.rs`. No more stapping. - Slightly adjusts the doc comment in the test to make it more clear. I ran a try-job against the beta branch (explicitly running the opt-dist tests by modifying the job definition) with these changes in #134131, and it appears that the try-job was [successful](rust-lang/rust#134131 (comment)). The two commits in this PR are cherry-picked from #134131, with the test commit slightly modified (to also adjust the test comments). r? `@Kobzol` (or compiler or bootstrap or infra I guess?)

jieyouxu added 2 commits December 10, 2024 21:58

Fix test name typo
e612cc2

[DO NOT MERGE] Log what --channel compiletest was told
d730a9e

jieyouxu added the S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. label Dec 10, 2024

[DO NOT MERGE] Run opt-dist tests
748a676

rustbot added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Dec 10, 2024

jieyouxu removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 10, 2024

This comment has been minimized.
Sign in to view

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 10, 2024

opt-dist: propagate channel info to bootstrap
41d70a3

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 19, 2024

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 Dec 19, 2024

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 19, 2024

This comment was marked as off-topic.
Sign in to view

jieyouxu closed this Dec 19, 2024

jieyouxu deleted the exp-bootstrap-test branch December 19, 2024 18:40

jieyouxu mentioned this pull request Dec 19, 2024
opt-dist: propagate channel info to bootstrap #134528
Merged

Uh oh!

Uh oh!

Conversation

jieyouxu commented Dec 10, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jieyouxu commented Dec 10, 2024

Uh oh!

bors commented Dec 10, 2024

Uh oh!

This comment has been minimized.

bors commented Dec 10, 2024

Uh oh!

jieyouxu commented Dec 10, 2024

Uh oh!

jieyouxu commented Dec 19, 2024

Uh oh!

bors commented Dec 19, 2024

Uh oh!

jieyouxu commented Dec 19, 2024

Uh oh!

jieyouxu commented Dec 19, 2024

Uh oh!

jieyouxu commented Dec 19, 2024

Uh oh!

This comment was marked as off-topic.

jieyouxu commented Dec 19, 2024

Uh oh!

bors commented Dec 19, 2024

Uh oh!

bors commented Dec 19, 2024

Uh oh!

jieyouxu commented Dec 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jieyouxu commented Dec 10, 2024•
edited
Loading