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

[beta] Update cargo #59623

Merged
merged 2 commits into from
Apr 3, 2019
Merged

[beta] Update cargo #59623

merged 2 commits into from
Apr 3, 2019

Conversation

sgrif
Copy link
Contributor

@sgrif sgrif commented Apr 1, 2019

This updates Cargo to the latest rust-1.34.0 branch

r? @alexcrichton

This updates Cargo to the latest rust-1.34.0 branch
@rust-highfive
Copy link
Collaborator

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

The job x86_64-gnu-llvm-6.0 of 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.
travis_time:end:007b6c09:start=1554157244701541953,finish=1554157328584379550,duration=83882837597
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
###################################                                       49.5%
######################################################################## 100.0%
[00:02:52] extracting /checkout/obj/build/cache/2019-02-28/cargo-0.34.0-x86_64-unknown-linux-gnu.tar.gz
[00:02:52]     Updating crates.io index
[00:03:06] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:03:06] Build completed unsuccessfully in 0:00:28
[00:03:06] make: *** [prepare] Error 1
[00:03:06] Makefile:70: recipe for target 'prepare' failed
[00:03:07] Command failed. Attempt 2/5:
[00:03:07] Command failed. Attempt 2/5:
[00:03:07]     Updating crates.io index
[00:03:08] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:03:08] Build completed unsuccessfully in 0:00:00
[00:03:08] Makefile:70: recipe for target 'prepare' failed
[00:03:08] make: *** [prepare] Error 1
[00:03:10] Command failed. Attempt 3/5:
[00:03:10] Command failed. Attempt 3/5:
[00:03:10]     Updating crates.io index
[00:03:10] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:03:10] Build completed unsuccessfully in 0:00:00
[00:03:10] make: *** [prepare] Error 1
[00:03:10] Makefile:70: recipe for target 'prepare' failed
[00:03:13] Command failed. Attempt 4/5:
[00:03:13] Command failed. Attempt 4/5:
[00:03:14]     Updating crates.io index
[00:03:14] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:03:14] Build completed unsuccessfully in 0:00:00
[00:03:14] make: *** [prepare] Error 1
[00:03:14] Makefile:70: recipe for target 'prepare' failed
[00:03:18] Command failed. Attempt 5/5:
[00:03:18] Command failed. Attempt 5/5:
[00:03:18]     Updating crates.io index
[00:03:19] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:03:19] Build completed unsuccessfully in 0:00:00
[00:03:19] Makefile:70: recipe for target 'prepare' failed
[00:03:19] make: *** [prepare] Error 1
[00:03:19] The command has failed after 5 attempts.

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)

@sgrif
Copy link
Contributor Author

sgrif commented Apr 1, 2019

Not entirely sure what to make of that build log

@ehuss
Copy link
Contributor

ehuss commented Apr 2, 2019

@sgrif run cargo update -p cargo in the root to pick up the new http dependency.

@sgrif
Copy link
Contributor Author

sgrif commented Apr 2, 2019

Thanks, should be green now

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 2, 2019

📌 Commit 567bc15 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 Apr 2, 2019
@Centril
Copy link
Contributor

Centril commented Apr 2, 2019

@bors p=1

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Apr 2, 2019
@bors
Copy link
Contributor

bors commented Apr 2, 2019

⌛ Testing commit 567bc15 with merge f0e6d140b1776f11c904c47ca35d76ef5bdd78ef...

@pietroalbini
Copy link
Member

@bors retry

Yielding priority since this is going to be rolled up.

@bors
Copy link
Contributor

bors commented Apr 3, 2019

⌛ Testing commit 567bc15 with merge 59400ff...

bors added a commit that referenced this pull request Apr 3, 2019
[beta] Update cargo

This updates Cargo to the latest rust-1.34.0 branch

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Apr 3, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing 59400ff to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 3, 2019
@bors bors merged commit 567bc15 into rust-lang:beta Apr 3, 2019
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