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 sccache to 0.10.0 #137665

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

Update sccache to 0.10.0 #137665

wants to merge 2 commits into from
+17 −98

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Feb 26, 2025 •
edited
Loading

This time, does it also for Windows and macOS. This unifies the sccache version across all OSes that we use.

r? @ghost

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
try-job: dist-x86_64-msvc
try-job: dist-x86_64-msvc-alt
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
try-job: dist-x86_64-linux

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Feb 26, 2025
@Kobzol
Copy link
Contributor Author

Kobzol commented Feb 26, 2025

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 26, 2025
@bors
Auto merge of rust-lang#137665 - Kobzol:update-sccache, r=<try>
11efbb8 
Update sccache to 0.10.0

This time, does it also for Windows and macOS.

r? `@ghost`

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
try-job: dist-x86_64-msvc
try-job: dist-x86_64-msvc-alt
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
@bors
Copy link
Contributor

bors commented Feb 26, 2025

⌛ Trying commit 16d785e with merge 11efbb8...

@bors
Copy link
Contributor

bors commented Feb 26, 2025

💔 Test failed - checks-actions

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 26, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Copy link
Contributor Author

Kobzol commented Feb 26, 2025

@bors try

@bors
Copy link
Contributor

bors commented Feb 26, 2025

⌛ Trying commit 8f57495 with merge 9a3b0bc...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 26, 2025
@bors
Auto merge of rust-lang#137665 - Kobzol:update-sccache, r=<try>
9a3b0bc 
Update sccache to 0.10.0

This time, does it also for Windows and macOS.

r? `@ghost`

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
try-job: dist-x86_64-msvc
try-job: dist-x86_64-msvc-alt
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 26, 2025

💔 Test failed - checks-actions

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Feb 26, 2025
@Kobzol
Copy link
Contributor Author

Kobzol commented Feb 26, 2025

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 26, 2025
@bors
Auto merge of rust-lang#137665 - Kobzol:update-sccache, r=<try>
31635b4 
Update sccache to 0.10.0

This time, does it also for Windows and macOS.

r? `@ghost`

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
try-job: dist-x86_64-msvc
try-job: dist-x86_64-msvc-alt
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
@bors
Copy link
Contributor

bors commented Feb 26, 2025

⌛ Trying commit e21ce6e with merge 31635b4...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 26, 2025

☀️ Try build successful - checks-actions
Build commit: 31635b4 (31635b430d20b52f7e3dc16efa8ed1a5d287abfa)

@Kobzol
Copy link
Contributor Author

Kobzol commented Feb 26, 2025

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 26, 2025
@bors
Auto merge of rust-lang#137665 - Kobzol:update-sccache, r=<try>
4c13ee2 
Update sccache to 0.10.0

This time, does it also for Windows and macOS.

r? `@ghost`

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
try-job: dist-x86_64-msvc
try-job: dist-x86_64-msvc-alt
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
@bors
Copy link
Contributor

bors commented Feb 26, 2025

⌛ Trying commit e21ce6e with merge 4c13ee2...

@bors bors mentioned this pull request Feb 26, 2025
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 26, 2025

💔 Test failed - checks-actions

@rustbot

This comment was marked as outdated.

Sign in to view
Kobzol added 2 commits March 1, 2025 19:12
@Kobzol
Update sccache to 0.10.0
e7ddda4 
This time, does it also for Windows and macOS.
@Kobzol
Remove sccache-plus-cl MSVC hack
6177f60
@Kobzol
Copy link
Contributor Author

Kobzol commented Mar 1, 2025

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
@bors
Auto merge of rust-lang#137665 - Kobzol:update-sccache, r=<try>
67ac55e 
Update sccache to 0.10.0

This time, does it also for Windows and macOS.

r? `@ghost`

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
try-job: dist-x86_64-msvc
try-job: dist-x86_64-msvc-alt
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
try-job: dist-x86_64-linux
@bors
Copy link
Contributor

bors commented Mar 1, 2025

⌛ Trying commit 6177f60 with merge 67ac55e...

@bors
Copy link
Contributor

bors commented Mar 1, 2025

☀️ Try build successful - checks-actions
Build commit: 67ac55e (67ac55e46ff7a364fd0256952fe1f126d88d5a94)

@Kobzol
Copy link
Contributor Author

Kobzol commented Mar 1, 2025

This PR removes a ~8 year old hack added by @alexcrichton (AFAIK) that worked around a sccache bug on 32-bit MSVC. I tried to remove the hack even without bumping sccache and it looks like CI passes, but I'm not sure if that's enough (?).

@ChrisDenton Is there an easy way to check that the compiled artifacts are indeed 32-bit?

@ChrisDenton
Copy link
Member

ChrisDenton commented Mar 1, 2025 •
edited
Loading

From the command line or in Rust? msys2 has file $exe whose output should contain Intel i386. Or there's the msvc dumpbin /header $exe where you can look for 14C machine (x86).

In Rust there's the object crate, specifically FileKind::parse will return FileKind::Pe32 for a 32-bit exe or dll.

@Kobzol
Copy link
Contributor Author

Kobzol commented Mar 2, 2025

Thanks, I was looking for the keywords like "Pe32" and "80386". Based on file it looks like it is indeed 32-bit.

r? @marcoieni,@onur-ozkan

(Marco for the infra changes, Onur for the bootstrap change)

@Kobzol
Copy link
Contributor Author

Kobzol commented Mar 2, 2025

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2025
onur-ozkan
onur-ozkan approved these changes Mar 2, 2025
View reviewed changes
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

LGTM overall

@marcoieni
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Mar 3, 2025

📌 Commit 6177f60 has been approved by marcoieni

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 3, 2025

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Mar 3, 2025
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Mar 6, 2025
@Noratrieb
Rollup merge of rust-lang#137665 - Kobzol:update-sccache, r=marcoieni
2943e91 
Update sccache to 0.10.0

This time, does it also for Windows and macOS. This unifies the sccache version across all OSes that we use.

r? `@ghost`

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
try-job: dist-x86_64-msvc
try-job: dist-x86_64-msvc-alt
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
try-job: dist-x86_64-linux
@Noratrieb Noratrieb mentioned this pull request Mar 6, 2025
Closed
@Kobzol Kobzol mentioned this pull request Mar 7, 2025
Open
@Kobzol
Copy link
Contributor Author

Kobzol commented Mar 7, 2025

@bors r-

This will conflict with #137612, so wait for that.

@rustbot blocked #137612

@rustbot rustbot added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 7, 2025
@bors 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. S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onur-ozkan onur-ozkan onur-ozkan approved these changes

Assignees

@marcoieni marcoieni

@onur-ozkan onur-ozkan

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

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