From 9bcfe72ec5de7cb969a2191bb2c8d22163be7625 Mon Sep 17 00:00:00 2001 From: Benjamin Summers Date: Tue, 10 Dec 2019 23:46:03 -0800 Subject: [PATCH] travis_retry doesn't work from bash scripts. --- .travis.yml | 1 + sh/travis-install-stack | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e119ec29b9..c222ad7f0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ install: - nix-env -iA cachix -f https://cachix.org/api/v1/install - stack --no-terminal --install-ghc build king --only-dependencies +# TODO Only do release builds on the `pull` branch? script: - cachix use urbit2 - ./sh/cachix || true diff --git a/sh/travis-install-stack b/sh/travis-install-stack index 95b32465d2..319379e69a 100755 --- a/sh/travis-install-stack +++ b/sh/travis-install-stack @@ -5,13 +5,13 @@ set -ex mkdir -p ~/.local/bin # OSX -# travis_retry curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin +# curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin mkdir -p tmp pax="https://get.haskellstack.org/stable/linux-x86_64.tar.gz" -travis_retry curl -L $pax | tar xz -C tmp +curl -L $pax | tar xz -C tmp mv tmp/stack-*/stack ~/.local/bin