Skip to content

Remove latest Windows SDK from 32-bit CI - #137753

Merged
bors merged 2 commits into
rust-lang:masterfrom
ChrisDenton:remove-sdk
Feb 28, 2025
Merged

Remove latest Windows SDK from 32-bit CI#137753
bors merged 2 commits into
rust-lang:masterfrom
ChrisDenton:remove-sdk

Conversation

@ChrisDenton

@ChrisDentonChrisDenton commented Feb 27, 2025•
edited
Loading

Copy link
Copy Markdown
Member

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

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

ChrisDenton commented Feb 27, 2025

Copy link
Copy Markdown
MemberAuthor

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 27, 2025
@bors
Auto merge ofrust-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

bors commented Feb 27, 2025

Copy link
Copy Markdown
Collaborator

⌛ 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 ofrust-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

bors commented Feb 28, 2025

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 6e629ad with merge d0b471d...

@rustbotrustbot 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
@ChrisDentonChrisDenton changed the title [do not merge] Remove Win SDK 10.0.26100.0 from CIRemove latest Windows SDK from 32-bit CIFeb 28, 2025
@ChrisDentonChrisDenton mentioned this pull request Feb 28, 2025
Closed
@ChrisDenton

ChrisDenton commented Feb 28, 2025

Copy link
Copy Markdown
MemberAuthor

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

r? infra

@Kobzol

Kobzol commented Feb 28, 2025

Copy link
Copy Markdown
Member

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

@ChrisDenton

ChrisDenton commented Feb 28, 2025

Copy link
Copy Markdown
MemberAuthor

Comment added!

@Kobzol

Kobzol commented Feb 28, 2025•
edited
Loading

Copy link
Copy Markdown
Member

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

@bors r+ rollup=never

@bors

bors commented Feb 28, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 25617c7 has been approved by Kobzol

It is now in the queue for this repository.

@borsbors 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

ChrisDenton commented Feb 28, 2025

Copy link
Copy Markdown
MemberAuthor

This might be a bit more urgent

@bors p=10

@bors

bors commented Feb 28, 2025

Copy link
Copy Markdown
Collaborator

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

@KobzolKobzol mentioned this pull request Feb 28, 2025
Closed
6 tasks
@meithecatte

meithecatte commented Feb 28, 2025

Copy link
Copy Markdown
Contributor

Do note that the tree is closed at priority 100.

@Kobzol

Kobzol commented Feb 28, 2025

Copy link
Copy Markdown
Member

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

@bors priority=101

@Kobzol

Kobzol commented Feb 28, 2025

Copy link
Copy Markdown
Member

@bors p=101

@meithecatte

meithecatte commented Feb 28, 2025

Copy link
Copy Markdown
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

ChrisDenton commented Feb 28, 2025•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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

EDIT: ninja'd

@Kobzol

Kobzol commented Feb 28, 2025

Copy link
Copy Markdown
Member

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

@jieyouxu

jieyouxu commented Feb 28, 2025

Copy link
Copy Markdown
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

ChrisDenton commented Feb 28, 2025

Copy link
Copy Markdown
MemberAuthor

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

@jieyouxu

jieyouxu commented Feb 28, 2025

Copy link
Copy Markdown
Member

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

@jieyouxujieyouxu mentioned this pull request Feb 28, 2025
Merged
@bors

bors commented Feb 28, 2025

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 28, 2025
@bors
bors merged commit 2f58193 into rust-lang:masterFeb 28, 2025
@rustbotrustbot 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

rust-timer commented Feb 28, 2025

Copy link
Copy Markdown
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.

meanrangecount
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

cuviper commented Feb 28, 2025

Copy link
Copy Markdown
Member

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

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 28, 2025
@cuvipercuviper modified the milestones: 1.87.0, 1.86.0Feb 28, 2025
@jieyouxujieyouxu 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 ofrust-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 ofrust-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 ofrust-lang#137849- jieyouxu:undo-workaround, r=Kobzol
45315a4
Revert "Remove Win SDK 10.0.26100.0 from CI"
Part of rust-lang#137733.
Resolvesrust-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 ofrust-lang#137849- jieyouxu:undo-workaround, r=Kobzol
0b66424
Revert "Remove Win SDK 10.0.26100.0 from CI"
Part of rust-lang#137733.
Resolvesrust-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 forrust-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.
Resolvesrust-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
@cuvipercuviper mentioned this pull request Mar 14, 2025
Merged
@cuvipercuviper 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 ofrust-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
@cuvipercuviper modified the milestones: 1.86.0, 1.85.1Mar 15, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@jdnojdno

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcbeta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.stable-acceptedAccepted for backporting to the compiler in the stable channel.T-infraRelevant 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