Skip to content

Revert "Remove Win SDK 10.0.26100.0 from CI" #137849

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 1 commit into from
Mar 4, 2025
Merged

Revert "Remove Win SDK 10.0.26100.0 from CI" #137849

merged 1 commit into from
Mar 4, 2025

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Mar 1, 2025 •
edited
Loading

Part of #137733.
Resolves #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 #137753.

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

@rustbot
Copy link
Collaborator

rustbot commented Mar 1, 2025

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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2025
@jieyouxu
Copy link
Member Author

jieyouxu commented Mar 1, 2025

Oh hey I forgor to r/? ghost but Kobzol is indeed the right reviewer 😄

@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#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
Copy link
Collaborator

bors commented Mar 1, 2025

⌛ Trying commit 32de3b9 with merge 55c4552...

@jieyouxu jieyouxu mentioned this pull request Mar 1, 2025
Closed
6 tasks
@bors
Copy link
Collaborator

bors commented Mar 1, 2025

☀️ Try build successful - checks-actions
Build commit: 55c4552 (55c45522ac060be5499ccfab86a2d6204d5363cc)

@jieyouxu jieyouxu marked this pull request as ready for review March 1, 2025 14:16
@jieyouxu jieyouxu changed the title [WIP] Revert "Remove Win SDK 10.0.26100.0 from CI" Revert "Remove Win SDK 10.0.26100.0 from CI" Mar 1, 2025
@jieyouxu jieyouxu added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Mar 1, 2025
@Kobzol
Copy link
Contributor

Kobzol commented Mar 1, 2025

Let's try. Hopefully future cc updates won't regress this somehow.

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Mar 1, 2025

📌 Commit 32de3b9 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 Mar 1, 2025
@Noratrieb
Copy link
Member

Noratrieb commented Mar 2, 2025 •
edited
Loading

@bors rollup=maybe

iffy would be more accurate but let's ensure this actually gets rolled up, the queue is very full

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 matthiaskrgr mentioned this pull request Mar 3, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2025
@bors
Auto merge of rust-lang#137918 - matthiaskrgr:rollup-7rozmxw, r=matth…
6d889f0 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#132388 (Implement `#[cfg]` in `where` clauses)
 - rust-lang#134900 (Fix parsing of ranges after unary operators)
 - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern)
 - rust-lang#137054 (Make phantom variance markers transparent)
 - rust-lang#137525 (Simplify parallelization in test-float-parse)
 - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch)
 - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc`)
 - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`)
 - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI")
 - rust-lang#137862 (ensure we always print all --print options in help)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2025
@bors
Auto merge of rust-lang#137918 - matthiaskrgr:rollup-7rozmxw, r=matth…
30918eb 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#132388 (Implement `#[cfg]` in `where` clauses)
 - rust-lang#134900 (Fix parsing of ranges after unary operators)
 - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern)
 - rust-lang#137054 (Make phantom variance markers transparent)
 - rust-lang#137525 (Simplify parallelization in test-float-parse)
 - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch)
 - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc`)
 - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`)
 - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI")
 - rust-lang#137862 (ensure we always print all --print options in help)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 3, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2025
@bors
Auto merge of rust-lang#137927 - matthiaskrgr:rollup-yj463ns, r=matth…
e9673f4 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#132388 (Implement `#[cfg]` in `where` clauses)
 - rust-lang#134900 (Fix parsing of ranges after unary operators)
 - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern)
 - rust-lang#137054 (Make phantom variance markers transparent)
 - rust-lang#137525 (Simplify parallelization in test-float-parse)
 - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch)
 - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`)
 - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI")
 - rust-lang#137862 (ensure we always print all --print options in help)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2025
@bors
Auto merge of rust-lang#137927 - matthiaskrgr:rollup-yj463ns, r=matth…
2010bba 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#132388 (Implement `#[cfg]` in `where` clauses)
 - rust-lang#134900 (Fix parsing of ranges after unary operators)
 - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern)
 - rust-lang#137054 (Make phantom variance markers transparent)
 - rust-lang#137525 (Simplify parallelization in test-float-parse)
 - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch)
 - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`)
 - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI")
 - rust-lang#137862 (ensure we always print all --print options in help)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0b66424 into rust-lang:master Mar 4, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 4, 2025
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
@jieyouxu jieyouxu deleted the undo-workaround branch March 4, 2025 06:29
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Kobzol Kobzol

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.

Tracking issue for i686 msvc CI issues with latest Windows 2022 runner image 20250224.5.0+
5 participants
@jieyouxu @rustbot @bors @Kobzol @Noratrieb