diff options
| author | bors <bors@rust-lang.org> | 2019-01-04 04:34:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-04 04:34:13 +0000 |
| commit | 62decc5c166c8c6a48e003cba7453c618f6986ee (patch) | |
| tree | 4f01d97381e4d0c585210c97927ae51720dee970 | |
| parent | c0bbc3927e28c22edefe6a1353b5ecc95ea9a104 (diff) | |
| parent | 66f0e42b4e6fd719099fe327d2731abd5b66ed41 (diff) | |
| download | rust-62decc5c166c8c6a48e003cba7453c618f6986ee.tar.gz rust-62decc5c166c8c6a48e003cba7453c618f6986ee.zip | |
Auto merge of #56958 - alexcrichton:upgrade-docker, r=kennytm
ci: Upgrade Travis to Xenial In theory we shouldn't require trusty so long as docker continues to work!
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 7f99678499a..c4efa884603 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: shell sudo: required -dist: trusty +dist: xenial services: - docker addons: diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index ebef27360c0..ad6188568cf 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -19,10 +19,12 @@ travis_time_start if [ -f "$docker_dir/$image/Dockerfile" ]; then if [ "$CI" != "" ]; then - cksum=$(find $docker_dir/$image $docker_dir/scripts -type f | \ + hash_key=/tmp/.docker-hash-key.txt + find $docker_dir/$image $docker_dir/scripts -type f | \ sort | \ - xargs cat | \ - sha512sum | \ + xargs cat >> $hash_key + docker --version >> $hash_key + cksum=$(sha512sum $hash_key | \ awk '{print $1}') s3url="s3://$SCCACHE_BUCKET/docker/$cksum" url="https://s3-us-west-1.amazonaws.com/$SCCACHE_BUCKET/docker/$cksum" |