From 66f0e42b4e6fd719099fe327d2731abd5b66ed41 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 18 Dec 2018 13:32:09 -0800
Subject: [PATCH] ci: Upgrade Travis to Xenial

In theory we shouldn't require trusty so long as docker continues to
work!
---
 .travis.yml          | 2 +-
 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"