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.

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

Make sure the build.rustc version is either the same or 1 apart #111538

Merged
merged 4 commits into from
May 15, 2023
Merged

Make sure the build.rustc version is either the same or 1 apart #111538

merged 4 commits into from
May 15, 2023

Conversation

chenyukang
Copy link
Member

Fixes #110067
r? @jyn514

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 13, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jyn514
Copy link
Member

jyn514 commented May 13, 2023 

failed to execute command: "/checkout/obj/build/aarch64-apple-darwin/stage0/bin/rustc" "--version"
error: Exec format error (os error 8)

error: test failed, to rerun pass `--lib`

thread 'config::tests::download_ci_llvm' panicked at 'status code: 1', lib.rs:1722:9

I think you need to slap if !builder.dry_run() on this new check.

This looks good! r=me if my suggestion fixes the build :)

@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 May 13, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@chenyukang
Copy link
Member Author

failed to execute command: "/checkout/obj/build/aarch64-apple-darwin/stage0/bin/rustc" "--version"

it turns out we are trying to run a binary of aarch64-apple-darwin on an x86_64-gnu VM, I assume this change is safe for the tests:
3e41587

seems those assertions are verifying logic hard-coded in Rust.

@jyn514
Copy link
Member

jyn514 commented May 14, 2023

yup that's totally fine! thanks for looking into this :)

@bors delegate=chenyukang (use r=jyn514)

@bors
Copy link
Contributor

bors commented May 14, 2023

✌️ @chenyukang can now approve this pull request

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@chenyukang chenyukang force-pushed the yukang-fix-110067-version-issue branch from cf40c22 to f14ebf0 Compare May 14, 2023 03:35
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@chenyukang chenyukang force-pushed the yukang-fix-110067-version-issue branch from f14ebf0 to 4648904 Compare May 14, 2023 04:45
bjorn3
bjorn3 reviewed May 14, 2023
View reviewed changes
src/bootstrap/config.rs Outdated Show resolved Hide resolved
@chenyukang
Copy link
Member Author

@bors r=jyn514

@bors
Copy link
Contributor

bors commented May 14, 2023

📌 Commit 5e2969e 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 14, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request May 15, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2023
@bors
Auto merge of rust-lang#111601 - matthiaskrgr:rollup-e5dguzb, r=matth…
63b2ee0 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#108291 (Fix more benchmark test with black_box)
 - rust-lang#108356 (improve doc test for UnsafeCell::raw_get)
 - rust-lang#110049 (Don't claim `LocalKey::with` prevents a reference to be sent across threads)
 - rust-lang#111525 (Stop checking for the absence of something that doesn't exist)
 - rust-lang#111538 (Make sure the build.rustc version is either the same or 1 apart)
 - rust-lang#111578 (Move expansion of query macros in rustc_middle to rustc_middle::query)
 - rust-lang#111584 (Number lexing tweaks)
 - rust-lang#111587 (Custom MIR: Support `Rvalue::CopyForDeref`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9267843 into rust-lang:master May 15, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 15, 2023
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 27, 2023
@Mark-Simulacrum
Revert "Rollup merge of rust-lang#111538 - chenyukang:yukang-fix-1100…
0809338 
…67-version-issue, r=jyn514"

This reverts commit 9267843, reversing
changes made to e52fbff.

This breaks our ability to bump the src/version where we're bootstrapping with an older compiler
than usual (according to version number). It's not clear whether the intended use case has a clean
solution given this constraint, so reverting for now - we can reland with a fix of some kind implemented.
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request May 27, 2023
Merged
@chenyukang chenyukang mentioned this pull request Jun 3, 2023
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 3, 2023
@matthiaskrgr
Rollup merge of rust-lang#112231 - chenyukang:yukang-fix-110067-versi…
eda593b 
…on-issue, r=jyn514

Make sure the build.rustc version is either the same or 1 apart (revised)

rust-lang#111538 is reverted in rust-lang#112023.

This PR will only check `build.rustc` to confirm the correct version.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 3, 2023
@matthiaskrgr
Rollup merge of rust-lang#112231 - chenyukang:yukang-fix-110067-versi…
d4f87d1 
…on-issue, r=jyn514

Make sure the build.rustc version is either the same or 1 apart (revised)

rust-lang#111538 is reverted in rust-lang#112023.

This PR will only check `build.rustc` to confirm the correct version.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

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.71.0
Development

Successfully merging this pull request may close these issues.

Confusing diagnostics for unstable features when building Rust with stable rustc
6 participants
@chenyukang @rust-log-analyzer @jyn514 @bors @bjorn3 @rustbot