From eda684661b2edc13a3698079241146a4932184ba Mon Sep 17 00:00:00 2001 From: Daniele Esposti Date: Tue, 3 Jul 2018 00:26:25 +0100 Subject: [PATCH 1/4] Added Rustup cache --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 84fd3f7d..1d6f5985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,3 +31,4 @@ cache: directories: - $HOME/.cache/pip - $HOME/.cache/pre-commit + - $HOME/.rustup From e6b6abeb9f5e022d44d2e8d3a98755d4d2bbeb1b Mon Sep 17 00:00:00 2001 From: Daniele Esposti Date: Tue, 3 Jul 2018 01:19:58 +0100 Subject: [PATCH 2/4] Added Swift cache --- .travis.yml | 1 + testing/get-swift.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d6f5985..094274b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,3 +32,4 @@ cache: - $HOME/.cache/pip - $HOME/.cache/pre-commit - $HOME/.rustup + - $HOME/.swift diff --git a/testing/get-swift.sh b/testing/get-swift.sh index a45291e2..e4380a35 100755 --- a/testing/get-swift.sh +++ b/testing/get-swift.sh @@ -11,6 +11,6 @@ fi mkdir -p /tmp/swift pushd /tmp/swift - wget "$SWIFT_URL" -O swift.tar.gz - tar -xf swift.tar.gz --strip 1 + wget -N -c "$SWIFT_URL" -O "$HOME"/.swift/swift.tar.gz + tar -xf "$HOME"/.swift/swift.tar.gz --strip 1 popd From 0f600ea0f06d31edb309345a9fdf2a94af45e0c8 Mon Sep 17 00:00:00 2001 From: Daniele Esposti Date: Wed, 4 Jul 2018 08:36:32 +0100 Subject: [PATCH 3/4] Wget timestamping incompatible with -O --- testing/get-swift.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testing/get-swift.sh b/testing/get-swift.sh index e4380a35..4b04c66d 100755 --- a/testing/get-swift.sh +++ b/testing/get-swift.sh @@ -4,13 +4,18 @@ set -ex . /etc/lsb-release if [ "$DISTRIB_CODENAME" = "trusty" ]; then - SWIFT_URL='https://swift.org/builds/swift-4.0.3-release/ubuntu1404/swift-4.0.3-RELEASE/swift-4.0.3-RELEASE-ubuntu14.04.tar.gz' + SWIFT_TARBALL="swift-4.0.3-RELEASE-ubuntu14.04.tar.gz" + SWIFT_URL="https://swift.org/builds/swift-4.0.3-release/ubuntu1404/swift-4.0.3-RELEASE/$SWIFT_TARBALL" else - SWIFT_URL='https://swift.org/builds/swift-4.0.3-release/ubuntu1604/swift-4.0.3-RELEASE/swift-4.0.3-RELEASE-ubuntu16.04.tar.gz' + SWIFT_TARBALL="swift-4.0.3-RELEASE-ubuntu16.04.tar.gz" + SWIFT_URL="https://swift.org/builds/swift-4.0.3-release/ubuntu1604/swift-4.0.3-RELEASE/$SWIFT_TARBALL" fi +pushd "$HOME"/.swift + wget -N -c "$SWIFT_URL" +popd + mkdir -p /tmp/swift pushd /tmp/swift - wget -N -c "$SWIFT_URL" -O "$HOME"/.swift/swift.tar.gz - tar -xf "$HOME"/.swift/swift.tar.gz --strip 1 + tar -xf "$HOME"/.swift/"$SWIFT_TARBALL" --strip 1 popd From b7ba4a1708cc7f79d01f38ba6f15bd82d977bb72 Mon Sep 17 00:00:00 2001 From: Daniele Esposti Date: Wed, 4 Jul 2018 22:39:07 +0100 Subject: [PATCH 4/4] Added hash of Swift tarballs --- testing/get-swift.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testing/get-swift.sh b/testing/get-swift.sh index 4b04c66d..54a37e58 100755 --- a/testing/get-swift.sh +++ b/testing/get-swift.sh @@ -5,14 +5,19 @@ set -ex . /etc/lsb-release if [ "$DISTRIB_CODENAME" = "trusty" ]; then SWIFT_TARBALL="swift-4.0.3-RELEASE-ubuntu14.04.tar.gz" + SWIFT_HASH="dddb40ec4956e4f6a3f4532d859691d5d1ba8822f6e8b4ec6c452172dbede5ae" SWIFT_URL="https://swift.org/builds/swift-4.0.3-release/ubuntu1404/swift-4.0.3-RELEASE/$SWIFT_TARBALL" else SWIFT_TARBALL="swift-4.0.3-RELEASE-ubuntu16.04.tar.gz" + SWIFT_HASH="9adf64cabc7c02ea2d08f150b449b05e46bd42d6e542bf742b3674f5c37f0dbf" SWIFT_URL="https://swift.org/builds/swift-4.0.3-release/ubuntu1604/swift-4.0.3-RELEASE/$SWIFT_TARBALL" fi +mkdir -p "$HOME"/.swift pushd "$HOME"/.swift wget -N -c "$SWIFT_URL" + echo "$SWIFT_HASH $SWIFT_TARBALL" > hash.txt + shasum -a 256 -c hash.txt popd mkdir -p /tmp/swift