diff --git a/.travis.yml b/.travis.yml index 0ee7b9df..3dc9707f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,9 @@ addons: packages: - libgmp-dev -matrix: - include: - #- env: CHECK_SCRIPT="./etc/ci-script.sh" - - env: CHECK_SCRIPT="./etc/curator-2-check.sh" - # Edit etc/ci-script.sh to change GHC version script: -- $CHECK_SCRIPT +- ./etc/curator-2-check.sh # Caching doesn't work with sudo: true #cache: diff --git a/etc/ci-script.sh b/etc/ci-script.sh deleted file mode 100755 index 192b2a9b..00000000 --- a/etc/ci-script.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -set -euxo pipefail - -export GHCVER=8.8.1 - -# Download and unpack the stack executable -mkdir -p ~/.local/bin -export PATH=$HOME/.local/bin:$PATH -curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' - -# Get stackage-curator -wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 -bunzip2 stackage-curator.bz2 -chmod +x stackage-curator -mv stackage-curator ~/.local/bin - -# Install GHC -stack setup $GHCVER - -# Update the index -stack update - -# Check -exec stack --resolver ghc-$GHCVER exec stackage-curator check diff --git a/etc/curator-2-check.sh b/etc/curator-2-check.sh index ac95ec8c..b006df08 100755 --- a/etc/curator-2-check.sh +++ b/etc/curator-2-check.sh @@ -11,7 +11,7 @@ export PATH=$HOME/.local/bin:$PATH curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' # Get new Stackage curator -CURATOR2=stackage-curator-2-f6258124cff9a7e92bcb5704164a70e149080e88 +CURATOR2=curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2 wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2" bunzip2 "$CURATOR2.bz2" chmod +x $CURATOR2