Skip to content

Remove latest Windows SDK from 32-bit CI #137753

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
Feb 28, 2025
Merged

Remove latest Windows SDK from 32-bit CI #137753

merged 2 commits into from
Feb 28, 2025

Conversation

ChrisDenton
Copy link
Member

@ChrisDenton ChrisDenton commented Feb 27, 2025 •
edited
Loading

This is an alternative to #137766, in case that doesn't work. It is in some ways simpler but is less principled and may be more flaky (as it involves deleting stuff).

try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-i686-msvc

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 27, 2025
@ChrisDenton ChrisDenton changed the title Remove Win SDK 10.0.26100.0 from CI [do not merge] Remove Win SDK 10.0.26100.0 from CI Feb 27, 2025
@ChrisDenton
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 27, 2025
@bors
Auto merge of rust-lang#137753 - ChrisDenton:remove-sdk, r=<try>
d992004 
[do not merge] Remove Win SDK 10.0.26100.0 from CI

r? `@ghost`

try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-i686-msvc
@bors
Copy link
Collaborator

bors commented Feb 27, 2025

⌛ Trying commit 6e629ad with merge d992004...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 28, 2025
@bors
Auto merge of rust-lang#137753 - ChrisDenton:remove-sdk, r=<try>
d0b471d 
[do not merge] Remove Win SDK 10.0.26100.0 from CI

r? `@ghost`

try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-i686-msvc
@bors
Copy link
Collaborator

bors commented Feb 28, 2025

⌛ Trying commit 6e629ad with merge d0b471d...

@ChrisDenton
Revert "Fix 32-bit MSVC CI"
f339951 
This reverts commit 6ea4823.
@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 Feb 28, 2025
@ChrisDenton ChrisDenton changed the title [do not merge] Remove Win SDK 10.0.26100.0 from CI Remove latest Windows SDK from 32-bit CI Feb 28, 2025
@ChrisDenton ChrisDenton mentioned this pull request Feb 28, 2025
Closed
@ChrisDenton
Copy link
Member Author

This is ready to merge unless you want to wait for me figure out #137766.

r? infra

@Kobzol
Copy link
Contributor

Kobzol commented Feb 28, 2025

Could you please just add a comment on top of the step with a link to the tracking issue? Thanks!

@ChrisDenton
Copy link
Member Author

Comment added!

@Kobzol
Copy link
Contributor

Kobzol commented Feb 28, 2025 •
edited
Loading

Thanks! Let's merge it preemptively, just in case GitHub updates the large runners soon.

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Feb 28, 2025

📌 Commit 25617c7 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 Feb 28, 2025
@ChrisDenton
Copy link
Member Author

This might be a bit more urgent

@bors p=10

@bors
Copy link
Collaborator

bors commented Feb 28, 2025

⌛ Testing commit 25617c7 with merge 2f58193...

@Kobzol Kobzol mentioned this pull request Feb 28, 2025
Closed
6 tasks
@meithecatte
Copy link
Contributor

Do note that the tree is closed at priority 100.

@Kobzol
Copy link
Contributor

Kobzol commented Feb 28, 2025

Lol, that sounds like a bors bug, it shouldn't even start to run CI on this PR. Thanks!

@bors priority=101

@Kobzol
Copy link
Contributor

Kobzol commented Feb 28, 2025

@bors p=101

@meithecatte
Copy link
Contributor

Ah, well, it's not a bors bug, because the tree got closed when CI for this PR was already running: #137775 (comment)

@ChrisDenton
Copy link
Member Author

ChrisDenton commented Feb 28, 2025 •
edited
Loading

The tree was closed after I did the priority bump so this just wasn't cancelled (which is good!)

EDIT: ninja'd

@Kobzol
Copy link
Contributor

Kobzol commented Feb 28, 2025

Ah, I forgot that it was a different tree closure, this situation is very dynamic =D

@jieyouxu
Copy link
Member

BTW if i686-msvc-{1,2} fails on debuginfo cdb tests, slap a //@ ignore-i686-pc-windows-msvc on every one of them to get this workaround through.

@ChrisDenton
Copy link
Member Author

It didn't in the try build but let's see

@jieyouxu
Copy link
Member

Oh maybe it's because the Windows 2019 attempt is using a cdb that's way too old.

@jieyouxu jieyouxu mentioned this pull request Feb 28, 2025
Merged
@bors
Copy link
Collaborator

bors commented Feb 28, 2025

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing 2f58193 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 28, 2025
@bors bors merged commit 2f58193 into rust-lang:master Feb 28, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 28, 2025
@ChrisDenton ChrisDenton deleted the remove-sdk branch February 28, 2025 13:32
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2f58193): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary 1.3%)

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.3% [1.3%, 1.3%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.3% [1.3%, 1.3%] 1

Cycles

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

Binary size

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

Bootstrap: 772.925s -> 771.133s (-0.23%)
Artifact size: 361.91 MiB -> 361.91 MiB (0.00%)

@cuviper
Copy link
Member

cuviper commented Feb 28, 2025

I'm going to grab this for beta now, instead of #137749.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 28, 2025
@cuviper cuviper modified the milestones: 1.87.0, 1.86.0 Feb 28, 2025
@jieyouxu jieyouxu mentioned this pull request Mar 1, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
@bors
Auto merge of rust-lang#137849 - jieyouxu:undo-workaround, r=<try>
55c4552 
[WIP] Revert "Remove Win SDK 10.0.26100.0 from CI"

Part of rust-lang#137733.

This reverts commit 25617c7, the remove-latest-windows-sdk workaround from rust-lang#137753.

try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-i686-msvc
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 2, 2025
@bors
Auto merge of rust-lang#137747 - cuviper:beta-next, r=cuviper
61e1603 
[beta] backports

- Pass vendored sources from bootstrap to generate-copyright rust-lang#137020
- Fix `-win7-windows-msvc` target since 26eeac1* rust-lang#137270
- skip submodule updating logics on tarballs rust-lang#137338
- Improve behavior of `IF_LET_RESCOPE` around temporaries and place expressions rust-lang#137444
- downgrade bootstrap `cc` rust-lang#137460
- Remove latest Windows SDK from 32-bit CI rust-lang#137753
- [beta-1.86] Ensure we can package directories ending with '.rs' (rust-lang/cargo#15248) rust-lang#137842

r? cuviper
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 3, 2025
@matthiaskrgr
Rollup merge of rust-lang#137849 - jieyouxu:undo-workaround, r=Kobzol
45315a4 
Revert "Remove Win SDK 10.0.26100.0 from CI"

Part of rust-lang#137733.
Resolves rust-lang#137733.

The remove-latest-windows-sdk workaround workaround should no longer be necessary, now that we bumped (1) cargo `cc` and (2) `rustc_{codegen_ssa,llvm}` `cc`.

This reverts commit 25617c7, the remove-latest-windows-sdk workaround from rust-lang#137753.

try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-i686-msvc
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 3, 2025
@matthiaskrgr
Rollup merge of rust-lang#137849 - jieyouxu:undo-workaround, r=Kobzol
0b66424 
Revert "Remove Win SDK 10.0.26100.0 from CI"

Part of rust-lang#137733.
Resolves rust-lang#137733.

The remove-latest-windows-sdk workaround workaround should no longer be necessary, now that we bumped (1) cargo `cc` and (2) `rustc_{codegen_ssa,llvm}` `cc`.

This reverts commit 25617c7, the remove-latest-windows-sdk workaround from rust-lang#137753.

try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-i686-msvc
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2025
@rust-timer
Unrolled build for rust-lang#137849
6e85d7b 
Rollup merge of rust-lang#137849 - jieyouxu:undo-workaround, r=Kobzol

Revert "Remove Win SDK 10.0.26100.0 from CI"

Part of rust-lang#137733.
Resolves rust-lang#137733.

The remove-latest-windows-sdk workaround workaround should no longer be necessary, now that we bumped (1) cargo `cc` and (2) `rustc_{codegen_ssa,llvm}` `cc`.

This reverts commit 25617c7, the remove-latest-windows-sdk workaround from rust-lang#137753.

try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-i686-msvc
@cuviper cuviper mentioned this pull request Mar 14, 2025
Merged
@cuviper cuviper added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Mar 15, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 15, 2025
@bors
Auto merge of rust-lang#138521 - cuviper:stable-next, r=cuviper
4eb1612 
[stable] Release 1.85.1

- [Fix the doctest-merging feature of the 2024 Edition.](rust-lang#137899)
- [Relax some `target_feature` checks when generating docs.](rust-lang#137632)
- [Fix errors in `std::fs::rename` on Windows 1607.](rust-lang#137528)
- [Downgrade bootstrap `cc` to fix custom targets.](rust-lang#137460)
- [Skip submodule updates when building Rust from a source tarball.](rust-lang#137338)

Added backports to fix CI:

- Remove latest Windows SDK from 32-bit CI rust-lang#137753
- Do not install rustup on Rust for Linux job rust-lang#137947

cc `@rust-lang/release`
r? cuviper
@cuviper cuviper modified the milestones: 1.86.0, 1.85.1 Mar 15, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@jdno jdno

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc beta-accepted Accepted for backporting to the compiler in the beta channel. 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. stable-accepted Accepted for backporting to the compiler in the stable channel. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.85.1
Development

Successfully merging this pull request may close these issues.
9 participants
@ChrisDenton @bors @Kobzol @meithecatte @jieyouxu @rust-timer @cuviper @jdno @rustbot