Skip to content

aarch64-msvc: remove CI hack for bad Windows SDK version #113854

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

Merged
merged 1 commit into from
Aug 1, 2023

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jul 19, 2023

This removes hack which manually replaced windows sdk version, as it looks like useless now, as CI uses newer version: https://github.com/rust-lang-ci/rust/actions/runs/5596259246/jobs/10233070602#step:24:929
C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\ucrt\corecrt_io.h (look at version)

related #88796

It's nice to have some way to assert bad version, but i don't see anything except checking env rust-lang/cc-rs#646

@rustbot
Copy link
Collaborator

rustbot commented Jul 19, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@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 Jul 19, 2023
@klensy klensy force-pushed the aarch64-msvc-remove-hack branch 2 times, most recently from 056fcb0 to 8680f31 Compare July 19, 2023 11:05
@rust-log-analyzer

This comment has been minimized.

@klensy klensy force-pushed the aarch64-msvc-remove-hack branch from 8680f31 to e947bd7 Compare July 19, 2023 12:18
@klensy
Copy link
Contributor Author

klensy commented Jul 19, 2023

Ok, builded successfully https://github.com/rust-lang/rust/actions/runs/5598315458/jobs/10237804937?pr=113854 (failed to upload attracts, but that's doesn't related, guess). Should i add note somewhere about bad windows sdk version, or left as it is?

@workingjubilee workingjubilee added the O-windows Operating system: Windows label Jul 30, 2023
@Mark-Simulacrum
Copy link
Member

I think this is fine as-is.

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 31, 2023

📌 Commit e947bd7 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@Mark-Simulacrum
Copy link
Member

@bors rollup=iffy

@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 Jul 31, 2023
@bors
Copy link
Collaborator

bors commented Aug 1, 2023

⌛ Testing commit e947bd7 with merge fe90d7d...

@bors
Copy link
Collaborator

bors commented Aug 1, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing fe90d7d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 1, 2023
@bors bors merged commit fe90d7d into rust-lang:master Aug 1, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 1, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (fe90d7d): 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)

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

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: missing data

@ehuss ehuss mentioned this pull request Sep 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows 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
Development

Successfully merging this pull request may close these issues.

7 participants