Rollup of 5 pull requests (all of which changes `src/ci/docker`) by kennytm · Pull Request #59298 · rust-lang/rust

kennytm · 2019-03-19T20:34:09Z

Successful merges:

[CI] Update binutils for powerpc64 and powerpc64le #58986 ([CI] Update binutils for powerpc64 and powerpc64le)
Track embedded-book in the toolstate #59038 (Track embedded-book in the toolstate)
CI: Set job names. #59055 (CI: Set job names.)
Calculate Docker cache hash precisely from Dockerfile's dependencies #59253 (Calculate Docker cache hash precisely from Dockerfile's dependencies)
Update CI configuration for building Redox libraries #59257 (Update CI configuration for building Redox libraries)

Failed merges:

Cargo powerpc64 and powerpc64le are seeing `SIGILL` crashes in openssl, which was found to be a linking problem, fixed by newer binutils. See <rust-lang#57345 (comment)> For powerpc64 we're using crosstool-ng, which doesn't offer a newer binutils version, but we can just compile it separately. On powerpc64le we're already building binutils. Both are now updated to binutils 2.32. Closesrust-lang/cargo#6320Closesrust-lang#57345Closesrust-lang/rustup#1620

Co-Authored-By: kennytm <kennytm@gmail.com>

This should make it easier to identify what each job is doing when looking at the Travis or Appveyor UI. - Set `name` for each job in Travis. - Move `CI_JOB_NAME` to the front in Appveyor so that it appears first in the UI.

`src/ci/docker`, so that when files under `dist-x86_64-linux` is changed, its dependent image `dist-i686-linux` will also be rebuilt. However, this ultraconservative solution caused the `dist-i686-linux` to be rebuilt every time an irrelevant Dockerfile (e.g. the PowerPC ones) is changed, which increases the building time beyond 3 hours and forcing a spurious but expected failure. This commit instead parses the Dockerfile itself and look for the actual dependencies. The scripts needs to be copied into the Docker image, which must be done with the COPY command, so we just need to find all lines with a COPY command and add the source file into the hash calculator. Note: this script only handles single-lined COPY command in the form `COPY src1 src2 src3 dst`, since these are the only variant used inside this repository.

@alexcrichton

[CI] Update binutils for powerpc64 and powerpc64le Cargo powerpc64 and powerpc64le are seeing `SIGILL` crashes in openssl, which was found to be a linking problem, fixed by newer binutils. See <rust-lang#57345 (comment)> For powerpc64 we're using crosstool-ng, which doesn't offer a newer binutils version, but we can just compile it separately. On powerpc64le we're already building binutils. Both are now updated to binutils 2.32. Closesrust-lang/cargo#6320Closesrust-lang#57345Closesrust-lang/rustup#1620 r? @alexcrichton

Track embedded-book in the toolstate The embedded book was tested in the tools job but the test result was never published. This PR adds maintainer information of embedded-book. This PR also requires the next update to embedded-book to pass the all tests, currently its state is test-fail. rust-lang-nursery/rust-toolstate#10 should be merged before this PR.

CI: Set job names. This should make it easier to identify what each job is doing when looking at the Travis or Appveyor UI. - Set `name` for each job in Travis. - Move `CI_JOB_NAME` to the front in Appveyor so that it appears first in the UI.

…r=pietroalbini Calculate Docker cache hash precisely from Dockerfile's dependencies rust-lang#58549 changed the Docker cache calculation to include every file under `src/ci/docker`, so that when files under `dist-x86_64-linux` is changed, its dependent image `dist-i686-linux` will also be rebuilt. However, this ultraconservative solution caused the `dist-i686-linux` to be rebuilt every time an irrelevant Dockerfile (e.g. the PowerPC ones) is changed, which increases the building time beyond 3 hours and forcing a spurious but expected failure. This commit instead parses the Dockerfile itself and look for the actual dependencies. The scripts needs to be copied into the Docker image, which must be done with the COPY command, so we just need to find all lines with a COPY command and add the source file into the hash calculator. Note: this script only handles single-lined COPY command in the form `COPY src1 src2 src3 dst`, since these are the only variant used inside this repository.

Update CI configuration for building Redox libraries This fixesrust-lang#59254

kennytm · 2019-03-19T20:35:47Z

@bors r+ p=78

bors · 2019-03-19T20:35:48Z

📌 Commit f31974a has been approved by kennytm

bors · 2019-03-20T00:36:26Z

⌛ Testing commit f31974a with merge 6d7a39b509e86fb989069ee3c6e3566379b8b508...

bors · 2019-03-20T03:37:39Z

💔 Test failed - checks-travis

rust-highfive · 2019-03-20T03:37:40Z

The job dist-x86_64-linux 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.

$ export AWS_SECRET_ACCESS_KEY=[secure]
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export GCP_CLIENT_SECRET=[secure]
Setting environment variables from .travis.yml
$ export CI_JOB_NAME=$TRAVIS_JOB_NAME
$ export DEPLOY=1
$ bash -c 'echo $BASH_VERSION'
4.3.48(1)-release
travis_fold:start:before_install.1
---
[00:01:19] [00:01:19] Total download size: 4.9 M
[00:01:19] Downloading Packages:
[00:01:23] --------------------------------------------------------------------------------
[00:01:23] Total 1.5 MB/s | 4.9 MB 00:03 [00:01:23] warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID e8562897
[00:01:23] Importing GPG key 0xE8562897 "CentOS-5 Key (CentOS 5 Official Signing Key) <centos-5-key@centos.org>" from /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
[00:01:23] Running Transaction Test
[00:01:23] Finished Transaction Test
[00:01:23] Transaction Test Succeeded
[00:01:23] Running Transaction
---
[00:04:07] + hide_output make install
[00:04:07] + set +x
[00:04:29] shared.sh: line 1: 352 Terminated bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:04:29] + cd ..
[00:04:29] + rm -rf openssl-1.0.2k
[00:04:29] ./build-openssl.sh: line 16: 4115 Terminated bash -c "while true; do sleep 30; echo \$(date) - building ...; done" (wd: /tmp/openssl-1.0.2k)
[00:04:29] + ln -nsf /etc/pki/tls/cert.pem /rustroot/ssl/
[00:04:30] ---> ae4a69f069b0
[00:04:30] Step 14/41 : COPY dist-x86_64-linux/build-curl.sh /tmp/
[00:04:30] ---> 70b92e5f79a6
[00:04:30] Step 15/41 : RUN ./build-curl.sh
[00:04:30] Step 15/41 : RUN ./build-curl.sh
[00:04:30] ---> Running in a5703aa460e0
[00:04:30] + source shared.sh
[00:04:30] + VERSION=7.51.0
[00:04:30] + curl http://cool.haxx.se/download/curl-7.51.0.tar.bz2
[00:04:32] % Total % Received % Xferd Average Speed Time Time Time Current
[00:04:32] Dload Upload Total Spent Left Speed
[00:04:33] 0 2509k 0 5527 0 0 3663 0 0:11:41 0:00:01 0:11:40 3663
0 2509k 0 5527 0 0 3663 0 0:11:41 0:00:01 0:11:40 3663
26 2509k 26 657k 0 0 291k 0 0:00:08 0:00:02 0:00:06 873k
100 2509k 100 2509k 0 0 903k 0 0:00:02 0:00:02 --:--:-- 1976k
[00:04:33] + mkdir curl-build
[00:04:33] + cd curl-build
[00:04:33] + hide_output ../curl-7.51.0/configure --prefix=/rustroot --with-ssl=/rustroot --disable-sspi --disable-gopher --disable-smtp --disable-smb --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-manual --disable-dict --disable-rtsp --disable-ldaps --disable-ldap
[00:04:58] + hide_output make -j10
[00:04:58] + set +x
[00:05:11] shared.sh: line 1: 13 Terminated bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:05:11] + hide_output make install
---
87 67.8M 87 59.0M 0 0 6985k 0 0:00:09 0:00:08 0:00:01 7363k
98 67.8M 98 66.6M 0 0 7066k 0 0:00:09 0:00:09 --:--:-- 7465k
100 67.8M 100 67.8M 0 0 7093k 0 0:00:09 0:00:09 --:--:-- 8224k
[00:09:03] + cd gcc-5.5.0
[00:09:03] + sed -i 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
[00:09:03] --2019-03-20 00:47:58-- http://gcc.gnu.org/pub/gcc/infrastructure/mpfr-2.4.2.tar.bz2
[00:09:03] Resolving gcc.gnu.org... 209.132.180.131
[00:09:04] Connecting to gcc.gnu.org|209.132.180.131|:80... connected.
[00:09:04] HTTP request sent, awaiting response... 200 OK
---
[01:15:45] ---> 44744e4a4dbb
[01:15:45] Step 25/41 : RUN ./build-clang.sh
[01:15:45] ---> Running in 097526f8d27b
[01:15:45] + source shared.sh
[01:15:45] + LLVM=llvmorg-8.0.0-rc2
[01:15:45] + cd llvm-project
[01:15:45] + cd llvm-project
[01:15:45] + curl -L https://github.com/llvm/llvm-project/archive/llvmorg-8.0.0-rc2.tar.gz
[01:15:45] + tar xzf - --strip-components=1
[01:15:45] Dload Upload Total Spent Left Speed
[01:15:46] 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
100 136 0 136 0 0 678 0 --:--:-- --:--:-- --:--:-- 786
---
[01:16:04] + cd clang-build
[01:16:04] + INC=/rustroot/include
[01:16:04] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed
[01:16:04] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed:/usr/include
[01:16:04] + hide_output cmake ../llvm -DCMAKE_C_COMPILER=/rustroot/bin/gcc -DCMAKE_CXX_COMPILER=/rustroot/bin/g++ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/rustroot -DLLVM_TARGETS_TO_BUILD=X86 '-DLLVM_ENABLE_PROJECTS=clang;lld' -DC_INCLUDE_DIRS=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed:/usr/include
[01:16:34] Wed Mar 20 01:55:29 UTC 2019 - building ...
[01:16:43] + hide_output make -j10
[01:16:43] + set +x
[01:17:13] Wed Mar 20 01:56:08 UTC 2019 - building ...
---
[02:42:48] ---> 82e84f84d82d
[02:42:48] Step 32/41 : RUN ./build-perl.sh
[02:42:48] ---> Running in 0277a2f6c0dc
[02:42:49] + source shared.sh
[02:42:49] + curl https://www.cpan.org/src/5.0/perl-5.28.0.tar.gz
[02:42:49] % Total % Received % Xferd Average Speed Time Time Time Current
[02:42:49] Dload Upload Total Spent Left Speed
[02:42:50] 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
4 17.0M 4 814k 0 0 1981k 0 0:00:08 --:--:-- 0:00:08 2360k
100 17.0M 100 17.0M 0 0 15.3M 0 0:00:01 0:00:01 --:--:-- 16.3M
[02:42:50] + cd perl-5.28.0
[02:42:50] + CC=gcc
[02:42:50] + CFLAGS='-I /rustroot/include -fgnu89-inline'
[02:42:50] + hide_output ./configure.gnu
[02:42:50] + set +x
[02:43:20] Wed Mar 20 03:22:15 UTC 2019 - building ...
[02:43:30] + hide_output make -j10

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)

kennytm · 2019-03-20T04:23:20Z

@bors retry

Expected timeout

bors · 2019-03-20T04:24:16Z

⌛ Testing commit f31974a with merge 05b02e5c47b163b25d0a3e90d96c650fd792ce60...

kennytm · 2019-03-20T04:38:47Z

@bors r+ treeclosed=2

Updated #59257.

bors · 2019-03-20T04:38:48Z

📌 Commit e2d1435831ee0934eaa51f2c4df45ee0c1aed12a has been approved by kennytm

bors · 2019-03-20T04:38:58Z

⌛ Testing commit e2d1435831ee0934eaa51f2c4df45ee0c1aed12a with merge 780184da93b48fe0caa9fae6e77949dc36d0fe84...

kennytm · 2019-03-20T05:01:34Z

@bors r+

bors · 2019-03-20T05:01:35Z

📌 Commit f31974a has been approved by kennytm

bors · 2019-03-20T05:01:46Z

⌛ Testing commit f31974a with merge 0c8700b...

@ghost

Rollup of 5 pull requests (all of which changes `src/ci/docker`) Successful merges: - #58986 ([CI] Update binutils for powerpc64 and powerpc64le) - #59038 (Track embedded-book in the toolstate) - #59055 (CI: Set job names.) - #59253 (Calculate Docker cache hash precisely from Dockerfile's dependencies) - #59257 (Update CI configuration for building Redox libraries) Failed merges: r? @ghost

bors · 2019-03-20T08:25:43Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: kennytm
Pushing 0c8700b to master...

rust-highfive · 2019-03-20T08:26:56Z

📣 Toolstate changed by #59298!

Tested on commit 0c8700b.
Direct link to PR: #59298

💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

@nrc

Tested on commit rust-lang/rust@0c8700b. Direct link to PR: <rust-lang/rust#59298> 💔 rls on windows: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

Zoxc · 2019-03-20T09:21:56Z

@bors treeclosed-

cuviperand others added 14 commits March 6, 2019 20:14

Wrap a long configure line
c843fe7

Track embedded-book in the toolstate
94a6936

Update src/tools/publish_toolstate.py
135b686
Co-Authored-By: kennytm <kennytm@gmail.com>

Fix tidy
d6f5100

CI: Set job names.
2070414
This should make it easier to identify what each job is doing when looking at the Travis or Appveyor UI. - Set `name` for each job in Travis. - Move `CI_JOB_NAME` to the front in Appveyor so that it appears first in the UI.

Update CI configuration for building Redox libraries
5c0f902

Use curl instead of wget in install-x86_64-redox.sh
f8bffad

Rollup merge ofrust-lang#59257- redox-os:upstream-redox, r=sanxiyn
f31974a
Update CI configuration for building Redox libraries This fixesrust-lang#59254

kennytm changed the title ~~Rollup of 5 pull requests~~Rollup of 5 pull requests (all of which changes src/ci/docker)Mar 19, 2019

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 19, 2019

denzp mentioned this pull request Mar 19, 2019
Introduce assembly tests suite #58791
Merged

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 Mar 20, 2019

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 Mar 20, 2019

kennytm mentioned this pull request Mar 20, 2019
Keep last redundant linker flag, not first #57018
Merged

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 Mar 20, 2019

kennytm force-pushed the rollup branch from f31974a to e2d1435Compare March 20, 2019 04:38

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 Mar 20, 2019

This comment has been minimized.
Sign in to view

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 Mar 20, 2019

kennytm force-pushed the rollup branch from e2d1435 to f31974aCompare March 20, 2019 05:01

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 Mar 20, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 20, 2019

bors merged commit f31974a into rust-lang:masterMar 20, 2019

This was referenced Mar 20, 2019
Add dist builder for Armv8-M Baseline and HF #59182
Merged
[WIP] Implement RFC2574 for FFI declarations #59238
Closed

mark-i-m mentioned this pull request Apr 1, 2019
Tracking Issue: Add rustc-guide to toolstate #59597
Closed
3 tasks

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Uh oh!

Uh oh!

Conversation

kennytm commented Mar 19, 2019

Uh oh!

kennytm commented Mar 19, 2019

Uh oh!

bors commented Mar 19, 2019

Uh oh!

bors commented Mar 20, 2019

Uh oh!

bors commented Mar 20, 2019

Uh oh!

rust-highfive commented Mar 20, 2019

Uh oh!

kennytm commented Mar 20, 2019

Uh oh!

bors commented Mar 20, 2019

Uh oh!

kennytm commented Mar 20, 2019

Uh oh!

bors commented Mar 20, 2019

Uh oh!

bors commented Mar 20, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

kennytm commented Mar 20, 2019

Uh oh!

bors commented Mar 20, 2019

Uh oh!

bors commented Mar 20, 2019

Uh oh!

bors commented Mar 20, 2019

Uh oh!

rust-highfive commented Mar 20, 2019

Uh oh!

Zoxc commented Mar 20, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants