Skip to content

Update Cargo to ffab51954ec32d55631c37a8730bb24915fc090b#43319

Merged
bors merged 1 commit into
rust-lang:masterfrom
SimonSapin:cargoup
Jul 21, 2017
Merged

Update Cargo to ffab51954ec32d55631c37a8730bb24915fc090b#43319
bors merged 1 commit into
rust-lang:masterfrom
SimonSapin:cargoup

Conversation

@SimonSapin

Copy link
Copy Markdown
Contributor

rust-lang/cargo#4123 added the [patch] section of the manifest

@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 18, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8724a5d has been approved by alexcrichton

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 18, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8a7101c has been approved by alexcrichton

@arielb1 arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 18, 2017
@bors

bors commented Jul 19, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8a7101caee81ebdd0cbb3d2f9fd231c4f7a2bc7f with merge dd4a07bf9e3c3a4b58acc5f7055146a30866f52f...

@bors

bors commented Jul 19, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@SimonSapin

Copy link
Copy Markdown
Contributor Author
 Downloading rustc-serialize v0.3.24
error: unable to get packages from source
Caused by:
  [35] SSL connect error (schannel: next InitializeSecurityContext failed: Unknown error (0x80092013) - The revocation function was unable to check revocation because the revocation server was offline.)

Temporary network failure?

@alexcrichton

alexcrichton commented Jul 19, 2017 via email

Copy link
Copy Markdown
Member

@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8a7101caee81ebdd0cbb3d2f9fd231c4f7a2bc7f with merge 20e6aefe59ef0193f05f6293e76d049a77fcd7f9...

@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Jul 21, 2017

Copy link
Copy Markdown
Member
[01:32:09] invalid license Apache-2.0 / MIT in /checkout/obj/build/tmp/distcheck/src/vendor/fnv/Cargo.toml
[01:32:09] some tidy checks failed

Needs to update src/tools/tidy/src/deps.rs.

@SimonSapin

Copy link
Copy Markdown
Contributor Author

I couldn’t reproduce the failure locally with ./x.py test src/tools/tidy, so here is a “blind” edit. r?

@eddyb

eddyb commented Jul 21, 2017

Copy link
Copy Markdown
Contributor

@bors r=alexcrichton

@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit b77ff24 has been approved by alexcrichton

@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b77ff24 with merge a8b921b338bd7d1935d6d23c5c0e7b6d792fb56f...

@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@SimonSapin

Copy link
Copy Markdown
Contributor Author
[00:06:08] ERROR: An error was encountered with the build.
[INFO ]  Performing some trivial sanity checks
[INFO ]  Build started 20170721.103231
[INFO ]  Building environment variables
[INFO ]  =================================================================
[INFO ]  Retrieving needed toolchain components' tarballs
[ERROR]  
[ERROR]  >>
[ERROR]  >>  Build failed in step 'Retrieving needed toolchain components' tarballs'
[ERROR]  >>        called in step '(top-level)'
[ERROR]  >>
[ERROR]  >>  Error happened in: do_isl_get[scripts/build/companion_libs/121-isl.sh@741]
[ERROR]  >>        called from: do_companion_libs_get[scripts/build/companion_libs.sh@15]
[ERROR]  >>        called from: main[scripts/crosstool-NG.sh@591]
[ERROR]  >>
[ERROR]  >>  For more info on this error, look at the file: 'build.log'
[ERROR]  >>  There is a list of known issues, some with workarounds, in:
[ERROR]  >>      '/usr/local/share/doc/crosstool-ng/crosstool-ng-1.22.0/B - Known issues.txt'
[ERROR]  
[ERROR]  (elapsed: 4:36.45)
[04:37] / make: *** [build] Error 1
[00:06:08] The command '/bin/sh -c ./build-s390x-toolchain.sh' returned a non-zero code: 1

Any idea?

@SimonSapin

Copy link
Copy Markdown
Contributor Author

Same failure in #43343 (comment), it seems nothing can land at the moment.

@aidanhs

aidanhs commented Jul 21, 2017

Copy link
Copy Markdown
Contributor

@bors retry

(a current retried build appears to have got past the issue, so the cached dockerfile should be used from now on which will hopefully resolve the issue)

TimNN added a commit to TimNN/rust that referenced this pull request Jul 21, 2017
Update Cargo to ffab51954ec32d55631c37a8730bb24915fc090b

rust-lang/cargo#4123 added the `[patch]` section of the manifest
bors added a commit that referenced this pull request Jul 21, 2017
Rollup of 8 pull requests

- Successful merges: #43046, #43256, #43280, #43297, #43313, #43319, #43322, #43343
- Failed merges:
@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b77ff24 with merge 496c12d5136727a3ea4535cfac46b066c653cdc9...

@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Jul 21, 2017

Copy link
Copy Markdown
Member

x86_64-unknown-linux-musl stage2-std test failed, feels like spurious. Not sure if the panic is relevant.

[01:06:09] thread '<unnamed>' panicked at 'explicit panic', /checkout/src/liballoc/../liballoc/tests/slice.rs:1194:16
...
[01:06:10] �(B�[m�[31m�[1merror:�(B�[m An unknown error occurred
[01:06:10] �(B�[m
[01:06:10] To learn more, run the command again with --verbose.
[01:06:10] 
[01:06:10] 
[01:06:10] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "-j" "4" "--target" "x86_64-unknown-linux-musl" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--features" "panic-unwind jemalloc backtrace" "-p" "std:0.0.0" "-p" "core:0.0.0" "-p" "unwind:0.0.0" "-p" "rustc_asan:0.0.0" "-p" "panic_abort:0.0.0" "-p" "rustc_tsan:0.0.0" "-p" "compiler_builtins:0.0.0" "-p" "rand:0.0.0" "-p" "rustc_lsan:0.0.0" "-p" "rustc_msan:0.0.0" "-p" "alloc_system:0.0.0" "-p" "std_unicode:0.0.0" "-p" "collections:0.0.0" "-p" "libc:0.0.0" "-p" "alloc:0.0.0" "--"

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry

@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b77ff24 with merge 15aa15b...

bors added a commit that referenced this pull request Jul 21, 2017
Update Cargo to ffab51954ec32d55631c37a8730bb24915fc090b

rust-lang/cargo#4123 added the `[patch]` section of the manifest
@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 15aa15b to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

9 participants