Skip to content

Work around CI issue with windows sdk 10.0.20348.0.#88797

Merged
bors merged 2 commits intorust-lang:masterfrom
m-ou-se:uhhhh
Sep 10, 2021
Merged

Work around CI issue with windows sdk 10.0.20348.0.#88797
bors merged 2 commits intorust-lang:masterfrom
m-ou-se:uhhhh

Conversation

@m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Sep 9, 2021 •
edited
Loading

@m-ou-se m-ou-se self-assigned this Sep 9, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 9, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@m-ou-se m-ou-se force-pushed the uhhhh branch 3 times, most recently from 683fec7 to 88ebd52 Compare September 9, 2021 23:47
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@m-ou-se m-ou-se force-pushed the uhhhh branch 3 times, most recently from 876ad7a to 403efb7 Compare September 9, 2021 23:59
@Manishearth Manishearth mentioned this pull request Sep 10, 2021
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@m-ou-se m-ou-se force-pushed the uhhhh branch 2 times, most recently from af5a0eb to 843d21f Compare September 10, 2021 00:40
@m-ou-se m-ou-se changed the title Trying stuff. Work around CI issue with windows sdk 10.0.20348.0. Sep 10, 2021
@m-ou-se m-ou-se marked this pull request as ready for review September 10, 2021 11:58
@m-ou-se
Copy link
Member Author

m-ou-se commented Sep 10, 2021

r? @pietroalbini

@rust-highfive rust-highfive assigned emilyalbini and unassigned m-ou-se Sep 10, 2021
@m-ou-se
Copy link
Member Author

m-ou-se commented Sep 10, 2021

(This was tested on dist-aarch64-msvc here: https://github.com/rust-lang/rust/pull/88797/checks?check_run_id=3566033204. Everything passed, except the last part where it would otherwise upload things to aws.)

@emilyalbini
Copy link
Member

emilyalbini commented Sep 10, 2021

@bors r+ p=1000

@bors
Copy link
Collaborator

bors commented Sep 10, 2021

📌 Commit 8059bc1 has been approved by pietroalbini

@bors
Copy link
Collaborator

bors commented Sep 10, 2021

🌲 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 Sep 10, 2021
@bors
Copy link
Collaborator

bors commented Sep 10, 2021

⌛ Testing commit 8059bc1 with merge 7bf0736...

@bors
Copy link
Collaborator

bors commented Sep 10, 2021

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing 7bf0736 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 10, 2021
@bors bors merged commit 7bf0736 into rust-lang:master Sep 10, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 10, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.57.0, 1.56.0 Sep 10, 2021
@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Sep 10, 2021
@rust-timer
Copy link
Collaborator

rust-timer commented Sep 10, 2021

Finished benchmarking commit (7bf0736): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@m-ou-se m-ou-se deleted the uhhhh branch September 10, 2021 18:24
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 11, 2021
@bors
Auto merge of rust-lang#88783 - Mark-Simulacrum:beta-next, r=Mark-Sim…
f9a839e 
…ulacrum

[beta] bootstrap bump and backports

This bumps the beta bootstrap compiler to the released 1.55.0, and backports the following PRs:

* Drop 1.56 stabilizations from 1.55 release notes rust-lang#88694
* 2229: Don't move out of drop type rust-lang#88477
* Work around CI issue with windows sdk 10.0.20348.0. rust-lang#88797

Cargo update:

1 commits in 18751dd3f238d94d384a7fe967abfac06cbfe0b9..d199d817e4bb70facc710716e73b5dddf80bc055
2021-09-01 14:26:00 +0000 to 2021-09-09 14:08:56 +0000
- [beta] Fix `cargo fix --edition` on stable. (rust-lang/cargo#9891)

r? `@Mark-Simulacrum`
@ehuss ehuss mentioned this pull request Sep 14, 2021
Closed
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 14, 2021
@ChrisDenton ChrisDenton mentioned this pull request Jul 19, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@emilyalbini emilyalbini

Labels

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.

Projects

None yet

Milestone

1.56.0

Development

Successfully merging this pull request may close these issues.

9 participants

@m-ou-se @rust-log-analyzer @emilyalbini @bors @rust-timer @cuviper @Mark-Simulacrum @rust-highfive @rustbot