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

Bump cc and run cargo update for bootstrap #130951

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

tgross35
Copy link
Contributor

Bump cc to 1.1.22, which includes a caching fix. Also run cargo update which does a minor increment on a few dependencies.

Bump `cc` to 1.1.22, which includes a caching fix. Also run `cargo
update` which does a minor increment on a few dependencies.
@rustbot
Copy link
Collaborator

rustbot commented Sep 27, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
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 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 27, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/

# NOTE: intentionally uses python2 for x.py so we can test it still works.
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
           --stage 0 src/tools/tidy tidyselftest --extra-checks=py:lint,cpp:fmt
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
#    pip-compile --allow-unsafe --generate-hashes reuse-requirements.in

@tgross35
Copy link
Contributor Author

The differences in cc are minor enough that I doubt anything needs to change in bootstrap (responding to the comment). We specifically want rust-lang/cc-rs#1215, which seems like it has a chance in improving the MSVC issue. More context on that starting around https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Spurious.20CI.20errors.20on.20x86_64-msvc-ext/near/472962033.

@tgross35 tgross35 closed this Sep 27, 2024
@tgross35 tgross35 reopened this Sep 27, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@Kobzol
Copy link
Contributor

Kobzol commented Sep 27, 2024

Looks like the dependency count stayed the same. The comment in the Cargo.toml file about cc updates sounded a bit worrying though :)

@tgross35
Copy link
Contributor Author

tgross35 commented Sep 27, 2024

Hm, not sure why it looks like these are getting the network errors.

Looks like the dependency count stayed the same. The comment in the Cargo.toml file about cc updates sounded a bit worrying though :)

Yes, I thought so too :) I made this just to see what the changes looked like after the automation PR. But with cc we specifically want rust-lang/cc-rs#1215 since it might help the MSVC error. The only other changes are rust-lang/cc-rs#1209 and rust-lang/cc-rs#1212 which I don't think would affect anything in bootstrap so that doesn't seem too concerning

@tgross35 tgross35 closed this Sep 27, 2024
@tgross35 tgross35 reopened this Sep 27, 2024
@tgross35
Copy link
Contributor Author

cc also @ChrisDenton since you've been doing some of the cc updates

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@tgross35 tgross35 closed this Sep 27, 2024
@tgross35 tgross35 reopened this Sep 27, 2024
@tgross35
Copy link
Contributor Author

Cc @onur-ozkan since you authored the comment at

# Most of the time updating these dependencies requires modifications to the
# bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
# otherwise, some targets will fail. That's why these dependencies are explicitly pinned.
, is there anything that would need to change with this cc update?

@onur-ozkan
Copy link
Member

Cc @onur-ozkan since you authored the comment at

# Most of the time updating these dependencies requires modifications to the
# bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
# otherwise, some targets will fail. That's why these dependencies are explicitly pinned.

, is there anything that would need to change with this cc update?

It's never clear tbh. We need to try and see if we need to make a change on bootstrap :)

@Kobzol
Copy link
Contributor

Kobzol commented Sep 30, 2024

So let's just merge and see what breaks? Do you want to wait for some confirmation from soneone @tgross35?

@tgross35
Copy link
Contributor Author

Oh no I just wanted to make sure I wasn't missing something, this is ready whenever you are :)

@Kobzol
Copy link
Contributor

Kobzol commented Sep 30, 2024

Ok, let's try.

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Sep 30, 2024

📌 Commit 3fb21f3 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 30, 2024
@bors
Copy link
Contributor

bors commented Sep 30, 2024

⌛ Testing commit 3fb21f3 with merge 63a0bdd...

@bors
Copy link
Contributor

bors commented Sep 30, 2024

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing 63a0bdd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 30, 2024
@bors bors merged commit 63a0bdd into rust-lang:master Sep 30, 2024
15 of 31 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 30, 2024
@tgross35 tgross35 deleted the cargo-update-bootstrap branch September 30, 2024 19:31
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (63a0bdd): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.8% [1.8%, 1.8%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.0%, secondary -3.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.0% [1.0%, 1.0%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.6% [-3.6%, -3.6%] 1
All ❌✅ (primary) 1.0% [1.0%, 1.0%] 1

Cycles

Results (secondary -1.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.2% [-1.2%, -1.2%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 768.953s -> 768.228s (-0.09%)
Artifact size: 341.42 MiB -> 341.42 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

7 participants