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

Actually prepare beta 1.49.0 #79162

Merged
merged 21 commits into from
Nov 18, 2020
Merged

Actually prepare beta 1.49.0 #79162

merged 21 commits into from
Nov 18, 2020

Conversation

pietroalbini
Copy link
Member

This PR sets everything up for beta 1.49.0, and backports the following PRs to it:

This is the same as #79132, but actually targeting the right branch.

r? @ghost
cc @rust-lang/release

pietroalbini and others added 21 commits November 17, 2020 12:33
If the LLVM was externally provided, then we don't currently copy artifacts into
the sysroot. This is not necessarily the right choice (in particular, it will
require the LLVM dylib to be in the linker's load path at runtime), but the
common use case for external LLVMs is distribution provided LLVMs, and in that
case they're usually in the standard search path (e.g., /usr/lib) and copying
them here is going to cause problems as we may end up with the wrong files and
isn't what distributions want.

This behavior may be revisited in the future though.
Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>
Co-authored-by: Camelid <camelidcamel@gmail.com>
Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>
@pietroalbini
Copy link
Member Author

@bors r+ p=500 rollup=never

@bors
Copy link
Contributor

bors commented Nov 18, 2020

📌 Commit 6142bf6 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 18, 2020
@bors
Copy link
Contributor

bors commented Nov 18, 2020

⌛ Testing commit 6142bf6 with merge dd09f70a6471d5b30f60b943036d271e9cab6dbf...

@bors
Copy link
Contributor

bors commented Nov 18, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 18, 2020
@pietroalbini
Copy link
Member Author

Forgot to include the aarch64 windows fix.

@bors r+ p=500

@bors
Copy link
Contributor

bors commented Nov 18, 2020

📌 Commit 7477867 has been approved by pietroalbini

@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 Nov 18, 2020
@mati865
Copy link
Contributor

mati865 commented Nov 18, 2020

Can you also include #79141?

@bors
Copy link
Contributor

bors commented Nov 18, 2020

⌛ Testing commit 7477867 with merge 21dea46...

@pietroalbini
Copy link
Member Author

@mati865 uh, just saw that, woops.

@bors
Copy link
Contributor

bors commented Nov 18, 2020

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing 21dea46 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 18, 2020
@bors bors merged commit 21dea46 into rust-lang:beta Nov 18, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 18, 2020
@pietroalbini pietroalbini deleted the beta-next branch December 23, 2020 22:59
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.

7 participants