Skip to content
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

[beta] Backport #84894 to fix beta CI #86092

Merged
merged 2 commits into from
Jun 8, 2021
Merged

Conversation

JohnTitor
Copy link
Member

Currently, beta backports fail with this failure: #86036 (comment)

STL1000: Unexpected compiler version, expected Clang 11.0.0 or newer.

The previous beta backport was successful because it uses a Visual Studio tool v14.28.29910 but now CI uses v14.29.30037.
#84894 updated clang to 12 so master didn't catch this change, I guess. Hopefully, it fixes CI failures on beta.

Currently, we have LLVM tarballs for win64, generated by someone running
the installer via wine and tarring up the result.

7z knows how to extract NSIS installers directly, and the result is
identical to our tarball, except that it doesn't include `Uninstall.exe`
(which we don't care about) and it includes the NSIS plugin directory
(which we also don't care about).

This simplifies the process of upgrading CI, and allows us to just
mirror the upstream release .exe directly. This also improves our
supply chain.
Needed for rust-lang#84764 . Tarballs
already uploaded to the CI mirror bucket.
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 7, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jun 7, 2021

📌 Commit ff4c377 has been approved by Mark-Simulacrum

@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 Jun 7, 2021
@bors
Copy link
Contributor

bors commented Jun 8, 2021

⌛ Testing commit ff4c377 with merge e7f4b8b...

@bors
Copy link
Contributor

bors commented Jun 8, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing e7f4b8b to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2021
@bors bors merged commit e7f4b8b into rust-lang:beta Jun 8, 2021
@rustbot rustbot added this to the 1.53.0 milestone Jun 8, 2021
@JohnTitor JohnTitor deleted the clang-12-beta branch June 8, 2021 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

6 participants