Skip to content

[BETA] Update cargo#62911

Merged
bors merged 1 commit intorust-lang:betafrom
ehuss:update-beta-cargo
Aug 5, 2019
Merged

[BETA] Update cargo#62911
bors merged 1 commit intorust-lang:betafrom
ehuss:update-beta-cargo

Conversation

@ehuss
Copy link
Contributor

@ehuss ehuss commented Jul 23, 2019 •
edited
Loading

3 commits in d0f828419d6ce6be21a90866964f58eb2c07cd56..9edd089168f8795b3890bc3daf5b99f03e9f8765
2019-07-23 21:58:59 +0000 to 2019-08-02 09:26:36 -0700

@rust-highfive
Copy link
Contributor

rust-highfive commented Jul 23, 2019

⚠️ 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!
  • 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 Jul 23, 2019
@alexcrichton
Copy link
Member

alexcrichton commented Jul 23, 2019

@bors: r+

@bors
Copy link
Collaborator

bors commented Jul 23, 2019

📌 Commit a4358d466e514e72fc767c9ad0e3f1d1d771b2f0 has been approved by alexcrichton

@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 Jul 23, 2019
@bors
Copy link
Collaborator

bors commented Jul 29, 2019

⌛ Testing commit a4358d466e514e72fc767c9ad0e3f1d1d771b2f0 with merge c4f6cb24ee32c5234a9a652529bcf2b233505c7a...

@bors
Copy link
Collaborator

bors commented Jul 29, 2019

💥 Test timed out

@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 Jul 29, 2019
@alexcrichton
Copy link
Member

alexcrichton commented Jul 29, 2019

@bors: retry

Looks like LLVM fell out of cache

@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 Jul 29, 2019
@emilyalbini
Copy link
Member

emilyalbini commented Aug 1, 2019

@bors p=-1

@ehuss ehuss force-pushed the update-beta-cargo branch from a4358d4 to 501f828 Compare August 2, 2019 16:31
@ehuss
Copy link
Contributor Author

ehuss commented Aug 2, 2019

@pietroalbini Are you planning a beta rollup? Just FYI, I just added a new commit here.

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Aug 2, 2019

📌 Commit 501f828 has been approved by alexcrichton

@emilyalbini
Copy link
Member

emilyalbini commented Aug 2, 2019

Are you planning a beta rollup?

Yeah in the next few days, which is the reason for the p=-1.

@emilyalbini
Copy link
Member

emilyalbini commented Aug 3, 2019

@bors r-

This should still be considered approved, but I'll include it in the rollup tomorrow.

@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 Aug 3, 2019
@emilyalbini
Copy link
Member

emilyalbini commented Aug 4, 2019

@bors r=alexcrichton p=-1

@bors
Copy link
Collaborator

bors commented Aug 4, 2019

📌 Commit 501f828 has been approved by alexcrichton

@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 Aug 4, 2019
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Aug 4, 2019
@emilyalbini
Rollup merge of rust-lang#62911 - ehuss:update-beta-cargo, r=alexcric…
8effd53 
…hton
@emilyalbini emilyalbini mentioned this pull request Aug 4, 2019
Merged
bors added a commit that referenced this pull request Aug 5, 2019
@bors
Auto merge of #63262 - pietroalbini:beta-rollup, r=pietroalbini
3f55461 
[beta] Rollup backports

Cherry picked:

*  Updated RELEASES.md for 1.37.0 #63147
*  Require a value for configure --debuginfo-level #62906
*  Make the parser TokenStream more resilient after mismatched delimiter recovery #62887
*  ci: move .azure-pipelines to src/ci/azure-pipelines #63242

Rolled up:

*  [BETA] Update cargo #62911
*  [beta] Backport #61207 #63254

r? @ghost
@bors bors merged commit 501f828 into rust-lang:beta Aug 5, 2019
@bors
Copy link
Collaborator

bors commented Aug 5, 2019

☔ The latest upstream changes (presumably #63262) made this pull request unmergeable. Please resolve the merge conflicts.

@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 Aug 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ehuss @rust-highfive @alexcrichton @bors @emilyalbini