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.

Sign up for GitHub

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

Jump to bottom

[beta]: Prepare the 1.31.0 beta release #55405

Merged
merged 27 commits into from
Oct 29, 2018
Merged

[beta]: Prepare the 1.31.0 beta release #55405

merged 27 commits into from
Oct 29, 2018

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Oct 27, 2018 •
edited by pietroalbini
Loading

  • Update to Cargo's branched 1.31.0 branch
  • Update the channel to beta

Rolled up beta-accepted PRs:

Note that this does not update the bootstrap compiler due to #55404

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@alexcrichton alexcrichton changed the base branch from master to beta October 27, 2018 06:27
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 27, 2018
@alexcrichton
Copy link
Member Author

r? @Mark-Simulacrum

@alexcrichton
Copy link
Member Author

@Mark-Simulacrum you may also know best how to triage/tag #55404

@alexcrichton alexcrichton changed the title [beta]: Prepare the 1.31.0 stable release [beta]: Prepare the 1.31.0 beta release Oct 27, 2018
@Mark-Simulacrum
Copy link
Member

@bors r+ p=5

@bors
Copy link
Contributor

bors commented Oct 28, 2018

📌 Commit c0230fe1fbec3f4e91635dc9eafb2a727a568bff 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 Oct 28, 2018
@pietroalbini
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 28, 2018
@pietroalbini
Copy link
Member

Rolled up beta-accepted PRs inside this one.

@bors r=Mark-Simulacrum p=5

@bors
Copy link
Contributor

bors commented Oct 28, 2018

📌 Commit 7d9a81406de8591a96091eb2246119a8ed1e50af 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 28, 2018
@bors
Copy link
Contributor

bors commented Oct 29, 2018

⌛ Testing commit 7d9a81406de8591a96091eb2246119a8ed1e50af with merge 8847a29102455ede37bc1d63c2b786a115af2a50...

@bors
Copy link
Contributor

bors commented Oct 29, 2018

💔 Test failed - status-appveyor

@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 Oct 29, 2018
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Oct 29, 2018 •
edited
Loading

Cc @nrc - looks like we might need an RLS update.. though this might be because of the lack of bootstrap compiler update...

@aturon @steveklabnik This probably means we can't get RC2 out tomorrow - it'll take probably till Tuesday at the earliest

@nrc
Copy link
Member

nrc commented Oct 29, 2018

looks like we might need an RLS update

I'm not sure where rustc and the RLS are coming from. RLS is broken with current nightly (will try and fix today, but realistically tomorrow). However, I believe the RLS that should have been uplifted to beta worked with the rustc at that time.

@Mark-Simulacrum
Copy link
Member

Yes - I'm not sure how this managed to break. I probably won't get a chance to take a look until tomorrow night unfortunately...

@kennytm kennytm added the S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. label Oct 29, 2018
@bors
Copy link
Contributor

bors commented Oct 29, 2018

⌛ Trying commit 7c81496 with merge 7ee121b8bbe37a8d2d8049cfa1243ecbcebbffc9...

@Mark-Simulacrum
Copy link
Member

@petrochenkov FWIW I think there was a bit of miscommunication with beta promotion timeline.

@bors
Copy link
Contributor

bors commented Oct 29, 2018

☀️ Test successful - status-travis
State: approved=pietroalbini try=True

@bors
Copy link
Contributor

bors commented Oct 29, 2018

⌛ Testing commit 7c81496 with merge a8b53646eee16bd1cb56df53c5fb0ab2b475c37c...

@bors
Copy link
Contributor

bors commented Oct 29, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 29, 2018
@rust-highfive
Copy link
Collaborator

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
Resolving deltas: 100% (8545/8545), done.
travis_time:end:2ed97afa:start=1540838114757705533,finish=1540838121340675308,duration=6582969775
$ cd rust-lang/rust
$ git checkout -qf a8b53646eee16bd1cb56df53c5fb0ab2b475c37c
fatal: reference is not a tree: a8b53646eee16bd1cb56df53c5fb0ab2b475c37c
The command "git checkout -qf a8b53646eee16bd1cb56df53c5fb0ab2b475c37c" failed and exited with 128 during .
Your build has been stopped.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@pietroalbini
Copy link
Member

What is happening with bors today :/

@pietroalbini pietroalbini reopened this Oct 29, 2018
@pietroalbini
Copy link
Member

@bors r+ p=1000

@bors
Copy link
Contributor

bors commented Oct 29, 2018

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Update compiler-builtins submodule #55303

@bors
Copy link
Contributor

bors commented Oct 29, 2018

📌 Commit 7c81496 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 Oct 29, 2018
@bors
Copy link
Contributor

bors commented Oct 29, 2018

⌛ Testing commit 7c81496 with merge 2824a67...

bors added a commit that referenced this pull request Oct 29, 2018
@bors
Auto merge of #55405 - alexcrichton:beta-next, r=pietroalbini
2824a67 
[beta]: Prepare the 1.31.0 beta release

* Update to Cargo's branched 1.31.0 branch
* Update the channel to `beta`

Rolled up beta-accepted PRs:

* #55362: Remove `cargo new --edition` from release notes.
* #55325: Fix link to macros chapter
* #55358: Remove redundant clone (2)
* #55346: Shrink `Statement`.
* #55274: Handle bindings in substructure of patterns with type ascriptions
* #55297: Partial implementation of uniform paths 2.0 to land before beta
* #55192: Fix ordering of nested modules in non-mod.rs mods
* #55185: path suggestions in Rust 2018 should point out the change in semantics
* #55423: back out bogus `Ok`-wrapping suggestion on `?` arm type mismatch

Note that **this does not update the bootstrap compiler** due to #55404
@bors
Copy link
Contributor

bors commented Oct 29, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pietroalbini
Pushing 2824a67 to beta...

@bors bors merged commit 7c81496 into rust-lang:beta Oct 29, 2018
@petrochenkov
Copy link
Contributor

@Mark-Simulacrum
Wait a second, #54145 is not in beta, how is that even possible?
Beta was branched off Oct 25, 2018, 4 days ago?!
That's even before this comment #55297 (comment).

That's not a bit of miscommunication, that's a total failure of communication.
All that stuff was explicitly targeting beta and worked on with that assumption.

@petrochenkov
Copy link
Contributor

petrochenkov commented Oct 29, 2018 •
edited
Loading

I see now what's the source of the cherry-picking issues - #54145 was supposed to be on beta, and #55297 and #55185 were supposed to go on top of it, but as it turns out #54145 is not in fact on beta.

@pietroalbini
Copy link
Member

@petrochenkov beta was branched off today with the last PR before #54145 landed, since that was the one breaking RLS. There are more details in #55405 (comment).

@petrochenkov
Copy link
Contributor

petrochenkov commented Oct 29, 2018 •
edited
Loading

@pietroalbini
Oh. I see.
If #54145 is indeed "un-betable", then this PR probably did the best it could.
I guess I'll have to continue work on #55297 directly on top of beta in this case.
Thanks for the clarification.

@pietroalbini
Copy link
Member

@petrochenkov I think we can backport #54145 once RLS is fixed (along with the RLS fix), so I wouldn't worry about working on top of beta. @Mark-Simulacrum can confirm that though.

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Oct 31, 2018
@alexcrichton
[beta] Update the boostrap compiler
dadaf12 
This follows up rust-lang#55405 with an update to the bootstrap compiler now that
a new version of `chalk-engine` is published.

Closes rust-lang#55404
@alexcrichton alexcrichton mentioned this pull request Oct 31, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pietroalbini pietroalbini pietroalbini left review comments

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.