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

Update cc + bump bootstrap deps #132994

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update cc + bump bootstrap deps #132994

wants to merge 3 commits into from
+411 −396

Conversation

clubby789
Copy link
Contributor

@clubby789 clubby789 commented Nov 13, 2024 •
edited
Loading

#132556 (comment)

note: The compiler/library/tools cc bumps have been tested with a try job, the bootstrap changes have not

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 13, 2024
@clubby789
Copy link
Contributor Author

@bors try

@clubby789 clubby789 added S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 13, 2024
@bors
Copy link
Contributor

bors commented Nov 13, 2024

⌛ Trying commit 8f8261e with merge 0eb0376...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 13, 2024
@bors
Auto merge of rust-lang#132994 - clubby789:cc-bisect, r=<try>
0eb0376 
[CI] bisecting cc issue

rust-lang#132556 (comment)

r? `@ghost`

First, checking if cc 1.2 fixes this
try-job: dist-various-2
@bors
Copy link
Contributor

bors commented Nov 13, 2024

☀️ Try build successful - checks-actions
Build commit: 0eb0376 (0eb03767585cbb3873320cf9816c715f5f619809)

@clubby789
Copy link
Contributor Author

Seems fixed in 1.2. Going to check first if we can bump safely in all locations, then I'll see if we can update the pinned version for bootstrap too
@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 13, 2024
@bors
Auto merge of rust-lang#132994 - clubby789:cc-bisect, r=<try>
d8936f4 
[CI] bisecting cc issue

rust-lang#132556 (comment)

r? `@ghost`

First, checking if cc 1.2 fixes this
try-job: dist-various-2
@bors
Copy link
Contributor

bors commented Nov 13, 2024

⌛ Trying commit 60edf9c with merge d8936f46b626668f31b4da6d30641531e4751fd4...

@bors
Copy link
Contributor

bors commented Nov 13, 2024

☀️ Try build successful - checks-actions
Build commit: d8936f4 (d8936f46b626668f31b4da6d30641531e4751fd4)

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Nov 13, 2024
@clubby789 clubby789 changed the title [CI] bisecting cc issue Update cc + bump bootstrap deps Nov 13, 2024
@clubby789 clubby789 marked this pull request as ready for review November 13, 2024 15:17
@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2024

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@clubby789
Copy link
Contributor Author

r? bootstrap

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Nov 13, 2024

☔ The latest upstream changes (presumably #132556) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 13, 2024
@clubby789
Copy link
Contributor Author

Looks like rust-lang/cc-rs#1225 made cc only accept hardcoded target triples, and we use some dummy ones in tests

clubby789
clubby789 commented Nov 13, 2024
View reviewed changes
src/bootstrap/src/core/builder/tests.rs
Comment on lines +8 to +11
static TEST_TRIPLE_1: &str = "i686-unknown-haiku";
static TEST_TRIPLE_2: &str = "i686-unknown-hurd-gnu";
static TEST_TRIPLE_3: &str = "i686-unknown-netbsd";

Copy link
Contributor Author

Choose a reason for hiding this comment

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

cc now requires real targets, so these are used instead of A-A. However, if I use tier 1/2 targets, I get failures like:

thread 'core::builder::tests::defaults::build_cross_compile' panicked at src/core/builder/tests.rs:301:9:
assertion failed: `(left == right)`

Diff < left / right > :
 [
     Std {
-        target: aarch64-unknown-linux-gnu,
+        target: x86_64-unknown-linux-gnu,
         compiler: Compiler {
             stage: 0,
             host: x86_64-unknown-linux-gnu,
         },
         crates: [],
         force_recompile: false,
         extra_rust_args: [],
         is_for_mir_opt_tests: false,
     },

Tier 3 works fine, but this seems like some weird behaviour

Copy link
Member

Choose a reason for hiding this comment

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

cc https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Weird.20error.20when.20using.20T1.2FT2.20targets.20in.20tests

@jieyouxu jieyouxu removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. labels Nov 14, 2024
@jieyouxu jieyouxu added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 14, 2024
@onur-ozkan
Copy link
Member

r? bootstrap (see #133036)

@rustbot rustbot assigned Kobzol and unassigned onur-ozkan Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu left review comments

Assignees

@Kobzol Kobzol

Labels
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)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@clubby789 @bors @rustbot @rust-log-analyzer @onur-ozkan @jieyouxu @Kobzol