diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-12-18 13:32:09 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2019-01-03 12:22:37 -0800 |
| commit | 66f0e42b4e6fd719099fe327d2731abd5b66ed41 (patch) | |
| tree | 5ab09a081eb226980698c898f3f204e21bf70f37 /src/ci/docker | |
| parent | a36b960df626cbb8bea74f01243318b73f0bd201 (diff) | |
| download | rust-66f0e42b4e6fd719099fe327d2731abd5b66ed41.tar.gz rust-66f0e42b4e6fd719099fe327d2731abd5b66ed41.zip | |
ci: Upgrade Travis to Xenial
In theory we shouldn't require trusty so long as docker continues to work!
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/run.sh | 8 |
1 files changed, 5 insertions, 3 deletions
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" |