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

Update cargo. #64952

Merged
merged 3 commits into from
Oct 2, 2019
Merged

Update cargo. #64952

merged 3 commits into from
Oct 2, 2019

Conversation

michaelwoerister
Copy link
Member

Pulls rust-lang/cargo@f3c92ed into nightly Rust.

r? @alexcrichton

@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 1, 2019
@rust-highfive
Copy link
Collaborator

The job mingw-check of your PR failed (pretty log, 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. 
2019-10-01T12:03:41.7201026Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-01T12:03:41.7405718Z ##[command]git config gc.auto 0
2019-10-01T12:03:41.7492903Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-01T12:03:41.7943647Z ##[command]git config --get-all http.proxy
2019-10-01T12:03:41.8083774Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64952/merge:refs/remotes/pull/64952/merge
---
2019-10-01T12:07:24.3747495Z extracting /checkout/obj/build/cache/2019-09-25/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
2019-10-01T12:07:24.4494887Z error: failed to resolve patches for `https://github.com/rust-lang/cargo`
2019-10-01T12:07:24.4495916Z 
2019-10-01T12:07:24.4496316Z Caused by:
2019-10-01T12:07:24.4497281Z   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
2019-10-01T12:07:24.4508016Z failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml
2019-10-01T12:07:24.4564295Z == clock drift check ==
2019-10-01T12:07:24.4574409Z   local time: Tue Oct  1 12:07:24 UTC 2019
2019-10-01T12:07:24.4817653Z   network time: Tue, 01 Oct 2019 12:07:24 GMT
2019-10-01T12:07:24.4824648Z == end clock drift check ==
2019-10-01T12:07:24.4824648Z == end clock drift check ==
2019-10-01T12:07:45.7184274Z ##[error]Bash exited with code '1'.
2019-10-01T12:07:45.7233735Z ##[section]Starting: Checkout
2019-10-01T12:07:45.7235745Z ==============================================================================
2019-10-01T12:07:45.7235803Z Task         : Get sources
2019-10-01T12:07:45.7235851Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

@alexcrichton
Copy link
Member

@bors: r+ p=1

(also cc @ehuss on this)

@bors
Copy link
Contributor

bors commented Oct 1, 2019

📌 Commit 3173a09 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 Oct 1, 2019
@jonas-schievink
Copy link
Contributor

This probably deserves a mention in the next release's blog post, right? (since we mentioned PGO when it got stabilized)

@bors
Copy link
Contributor

bors commented Oct 1, 2019

⌛ Testing commit 3173a09 with merge 96dc74c36dff7ac14b7b1e96c9571aa382b36fae...

@ehuss
Copy link
Contributor

ehuss commented Oct 1, 2019

This will break RLS. I normally wait for the fix to merge and then update them together to reduce the churn and disruption. It's not a big deal, but I feel like our process is not working well.

Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@Centril
Rollup merge of rust-lang#64952 - michaelwoerister:update-cargo, r=al…
98344d7 
…excrichton

Update cargo.

Pulls rust-lang/cargo@f3c92ed into nightly Rust.

r? @alexcrichton
@Centril Centril mentioned this pull request Oct 1, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Oct 1, 2019

@bors retry rolled up.

bors added a commit that referenced this pull request Oct 1, 2019
@bors
Auto merge of #64958 - Centril:rollup-8k5m97o, r=Centril
8d0ebb2 
Rollup of 5 pull requests

Successful merges:

 - #63416 (apfloat: improve doc comments)
 - #64404 (Add long error explanation for E0495)
 - #64910 (syntax: cleanup param, method, and misc parsing)
 - #64912 (Remove unneeded `fn main` blocks from docs)
 - #64952 (Update cargo.)

Failed merges:

r? @ghost
@Xanewok
Copy link
Member

Xanewok commented Oct 1, 2019

The fix has landed in the RLS so you can also update the RLS submodule as well.

@Xanewok Xanewok closed this Oct 1, 2019
@Xanewok Xanewok reopened this Oct 1, 2019
@Xanewok
Copy link
Member

Xanewok commented Oct 1, 2019

Dear, fat-fingered this one. Sorry.

tmandry added a commit to tmandry/rust that referenced this pull request Oct 1, 2019
@tmandry
Rollup merge of rust-lang#64952 - michaelwoerister:update-cargo, r=al…
243dbc5 
…excrichton

Update cargo.

Pulls rust-lang/cargo@f3c92ed into nightly Rust.

r? @alexcrichton
@tmandry tmandry mentioned this pull request Oct 1, 2019
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Oct 1, 2019
@tmandry
Rollup merge of rust-lang#64952 - michaelwoerister:update-cargo, r=al…
f38b393 
…excrichton

Update cargo.

Pulls rust-lang/cargo@f3c92ed into nightly Rust.

r? @alexcrichton
@tmandry tmandry mentioned this pull request Oct 1, 2019
Closed
@tmandry
Copy link
Member

tmandry commented Oct 1, 2019 •
edited
Loading

@bors retry rolled up

Also: The homu queue page says it's building this PR, but I don't see any comment here that it's building or a build in the azure queue.

@tmandry tmandry added the A-spurious Area: Spurious failures in builds (spuriously == for no apparent reason) label Oct 1, 2019
@bors
Copy link
Contributor

bors commented Oct 1, 2019

⌛ Testing commit 3173a09 with merge 2a0dee835302f3f8647fa7afac8b6bc2f70edd54...

@tmandry
Copy link
Member

tmandry commented Oct 1, 2019

This appears to have failed in #64966, see this log.
@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 1, 2019
@alexcrichton
Copy link
Member

@bors: r+

Included a fix for that failed test as well as an RLS update

@bors
Copy link
Contributor

bors commented Oct 1, 2019

📌 Commit 8d9abcd 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 Oct 1, 2019
@bors
Copy link
Contributor

bors commented Oct 2, 2019

⌛ Testing commit 8d9abcd with merge 0099c7b6bb5afe85b526f024bc49139eeae98e66...

tmandry added a commit to tmandry/rust that referenced this pull request Oct 2, 2019
@tmandry
Rollup merge of rust-lang#64952 - michaelwoerister:update-cargo, r=al…
2f29548 
…excrichton

Update cargo.

Pulls rust-lang/cargo@f3c92ed into nightly Rust.

r? @alexcrichton
@tmandry tmandry mentioned this pull request Oct 2, 2019
Merged
@tmandry
Copy link
Member

tmandry commented Oct 2, 2019

@bors retry rolled up

bors added a commit that referenced this pull request Oct 2, 2019
@bors
Auto merge of #64981 - tmandry:rollup-slfkhay, r=tmandry
f2023ac 
Rollup of 11 pull requests

Successful merges:

 - #64649 (Avoid ICE on return outside of fn with literal array)
 - #64722 (Make all alt builders produce parallel-enabled compilers)
 - #64801 (Avoid `chain()` in `find_constraint_paths_between_regions()`.)
 - #64805 (Still more `ObligationForest` improvements.)
 - #64840 (SelfProfiler API refactoring and part one of event review)
 - #64885 (use try_fold instead of try_for_each to reduce compile time)
 - #64942 (Fix clippy warnings)
 - #64952 (Update cargo.)
 - #64974 (Fix zebra-striping in generic dataflow visualization)
 - #64978 (Fully clear `HandlerInner` in `Handler::reset_err_count`)
 - #64979 (Update books)

Failed merges:

 - #64959 (syntax: improve parameter without type suggestions)

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 2, 2019

⌛ Testing commit 8d9abcd with merge f2023ac...

@bors bors merged commit 8d9abcd into rust-lang:master Oct 2, 2019
@sinkuu sinkuu mentioned this pull request Oct 3, 2019
Closed
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
A-spurious Area: Spurious failures in builds (spuriously == for no apparent reason) 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.
9 participants
@michaelwoerister @rust-highfive @alexcrichton @bors @jonas-schievink @ehuss @Centril @Xanewok @tmandry