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

Prepare beta 1.49.0 #79132

Merged
merged 21 commits into from
Nov 18, 2020
Merged

Prepare beta 1.49.0 #79132

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:

r? @ghost
cc @rust-lang/release

pietroalbini and others added 19 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=10 rollup=never

@bors
Copy link
Contributor

bors commented Nov 17, 2020

📌 Commit d2df222 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 17, 2020
@bors
Copy link
Contributor

bors commented Nov 17, 2020

⌛ Testing commit d2df222 with merge b76bca10782295d1faacf308d34d9616667f17fa...

@bors
Copy link
Contributor

bors commented Nov 17, 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 17, 2020
@pietroalbini
Copy link
Member Author

Hmm, what. Running ./x.py test --stage 2 src/test/ui-fulldeps/ on my machine passes all the tests :/

@Mark-Simulacrum
Copy link
Member

@bors r+

Cherry-picked a bump of the stderr file for that test. I suspect this is the same problem I saw last time, but I haven't had a chance to look into it much. My loose recollection is there's some channel dependency, but I don't recall why I concluded as such.

@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 17, 2020
@jyn514 jyn514 added the T-release Relevant to the release subteam, which will review and decide on the PR/issue. label Nov 17, 2020
@bors
Copy link
Contributor

bors commented Nov 17, 2020

⌛ Testing commit 6142bf6 with merge b201852ebca131fc017548afea819082cc137d00...

@bors
Copy link
Contributor

bors commented Nov 17, 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 17, 2020
@Mark-Simulacrum
Copy link
Member

Ok, I think I have an understanding of why this is an error. #75914 merged in the 1.49 cycle (the beta this PR kicks off). RLS on aarch64 windows never compiled, because winapi 0.2 isn't compatible with aarch64 (it defines some types only on x86 and x86_64). We missed this earlier because toolstate is only looked at by default for x86_64 on the dashboard at https://rust-lang-nursery.github.io/rust-toolstate/.

I'm not sure what the right step here is. I suspect the best bet is probably to just disable RLS on aarch64 Windows, though we may encounter the same problem with other tools (haven't checked). I will try to implement that later today or someone else can take a stab.

@cuviper
Copy link
Member

cuviper commented Nov 17, 2020

RLS has an issue for aarch64 windows: rust-lang/rls#1693

@Mark-Simulacrum
Copy link
Member

@bors r+

Pushed a commit that should just permit the failure of RLS on aarch64 Windows, which should fix this. I think for now that's fine.

@bors
Copy link
Contributor

bors commented Nov 17, 2020

📌 Commit 7477867 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 Nov 17, 2020
@mati865
Copy link
Contributor

mati865 commented Nov 18, 2020

I haven't noticed it earlier but you might want to include #79141 if this PR fails again.

@bors
Copy link
Contributor

bors commented Nov 18, 2020

⌛ Testing commit 7477867 with merge 87776d7...

@bors
Copy link
Contributor

bors commented Nov 18, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 18, 2020
@bors bors merged commit 87776d7 into rust-lang:master Nov 18, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 18, 2020
@pietroalbini pietroalbini deleted the beta-next branch November 18, 2020 09:52
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Nov 18, 2020
…k-Simulacrum"

This was landed on master instead of beta!
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2020
Revert rust-lang#79132

The beta promotion release was mistakenly landed on master instead of beta. Ugh.

r? `@ghost`
cc `@rust-lang/release`
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2020
Actually prepare beta 1.49.0

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

* rust-lang#79107 - build-manifest: strip newline from rustc version
* rust-lang#78986 - Avoid installing external LLVM dylibs
* rust-lang#79074 - Install CI llvm into the library directory
* rust-lang#78364 - Update RELEASES.md for 1.48.0
* rust-lang#77939 - Ensure that the source code display is working with DOS backline

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

r? `@ghost`
cc `@rust-lang/release`
@Xanewok Xanewok mentioned this pull request Feb 10, 2021
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. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants