Skip to content

skip target sanity check when it's a local-rebuild #130261

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Sep 13, 2024
Merged

skip target sanity check when it's a local-rebuild #130261

merged 2 commits into from
Sep 13, 2024

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Sep 12, 2024 •
edited
Loading

Running the stage0 target sanity check on the newly built compiler can result in errors and incorrect assumptions.

Resolves #130242

@rustbot
Copy link
Collaborator

rustbot commented Sep 12, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Sep 12, 2024

Some changes occurred in src/tools/opt-dist

cc @Kobzol

@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 Sep 12, 2024
@rust-log-analyzer

This comment has been minimized.

# to view
@onur-ozkan
skip target sanity check when it's a local-rebuild
041b59e 
Running the stage0 target sanity check on the newly built compiler can result
in errors and incorrect assumptions.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
use local-rebuild instead of BOOTSTRAP_SKIP_TARGET_SANITY workaround
654513e 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@lqd
Copy link
Member

lqd commented Sep 12, 2024 •
edited
Loading

Do we also need to revert https://github.com/rust-lang/rustc-perf/pull/1973/files and do the same as this PR? (because the target tests had the same issues on perf.rlo as opt-dist and "broke" the bootstrapping benchmark)

@onur-ozkan
Copy link
Member Author

Do we also need to revert https://github.com/rust-lang/rustc-perf/pull/1973/files and do the same as this PR? (because the target tests had the same issues on perf.rlo as opt-dist and "broke" the bootstrapping benchmark)

That doesn't really seem like a local rebuild.

@Kobzol
Copy link
Contributor

Kobzol commented Sep 12, 2024

Could you please comment out DIST_TRY_BUILD in src/ci/github-actions/jobs.yml and do a try build for dist-x86_64-linux?

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 12, 2024
@onur-ozkan
Copy link
Member Author

Could you please comment out DIST_TRY_BUILD in src/ci/github-actions/jobs.yml and do a try build for dist-x86_64-linux?

Sure.

@bors try

@bors
Copy link
Collaborator

bors commented Sep 12, 2024

⌛ Trying commit 98e3406 with merge f9a4006...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 12, 2024
@bors
Auto merge of rust-lang#130261 - onur-ozkan:rust-lang#130242, r=<try>
f9a4006 
skip target sanity check when it's a `local-rebuild`

Running the stage0 target sanity check on the newly built compiler can result in errors and incorrect assumptions.

Resolves rust-lang#130242

try-job: dist-x86_64-linux
@bors
Copy link
Collaborator

bors commented Sep 12, 2024

☀️ Try build successful - checks-actions
Build commit: f9a4006 (f9a400647f18b8572a14999e43b3bbc9c84cae20)

@Kobzol
Copy link
Contributor

Kobzol commented Sep 12, 2024

You can r=me after reverting the temporary change.

@onur-ozkan onur-ozkan removed A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 12, 2024
@onur-ozkan
Copy link
Member Author

@bors r=Kobzol

@bors
Copy link
Collaborator

bors commented Sep 12, 2024

📌 Commit 654513e has been approved by Kobzol

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 Sep 12, 2024
@Zalathar Zalathar mentioned this pull request Sep 13, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2024
@bors
Auto merge of rust-lang#130303 - Zalathar:rollup-8vsqdox, r=Zalathar
473ae00 
Rollup of 3 pull requests

Successful merges:

 - rust-lang#130245 (make basic allocation functions track_caller in Miri for nicer backtraces)
 - rust-lang#130261 (skip target sanity check when it's a `local-rebuild`)
 - rust-lang#130287 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 9))

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 26bda05 into rust-lang:master Sep 13, 2024
12 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2024
@rust-timer
Unrolled build for rust-lang#130261
10e5c7e 
Rollup merge of rust-lang#130261 - onur-ozkan:rust-lang#130242, r=Kobzol

skip target sanity check when it's a `local-rebuild`

Running the stage0 target sanity check on the newly built compiler can result in errors and incorrect assumptions.

Resolves rust-lang#130242
@onur-ozkan onur-ozkan deleted the #130242 branch September 13, 2024 14:22
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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

Successfully merging this pull request may close these issues.

Target sanity-check in bootstrap incorrect when doing a local-rebuild
7 participants
@onur-ozkan @rustbot @rust-log-analyzer @lqd @Kobzol @bors @Mark-Simulacrum