diff --git a/.travis.yml b/.travis.yml index 3dc9707f..fae1766b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: # Edit etc/ci-script.sh to change GHC version script: -- ./etc/curator-2-check.sh +- ./etc/check.sh # Caching doesn't work with sudo: true #cache: diff --git a/etc/curator-2-check.sh b/etc/check.sh similarity index 58% rename from etc/curator-2-check.sh rename to etc/check.sh index b006df08..78a5345f 100755 --- a/etc/curator-2-check.sh +++ b/etc/check.sh @@ -11,11 +11,8 @@ 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=curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2 -wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2" -bunzip2 "$CURATOR2.bz2" -chmod +x $CURATOR2 -mv $CURATOR2 ~/.local/bin/stackage-curator-2 +curl "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator +chmod +x curator # Install GHC stack setup $GHCVER @@ -24,8 +21,8 @@ stack setup $GHCVER # because of a different constraints handling in minor LTS version bumps NIGHTLY="nightly-$(date +%Y-%m-%d)" # New curator check -stackage-curator-2 update && - stackage-curator-2 constraints --target=$NIGHTLY && - stackage-curator-2 snapshot-incomplete && - stackage-curator-2 snapshot && - stack --resolver ghc-$GHCVER exec stackage-curator-2 check-snapshot +./curator update && + ./curator constraints --target=$NIGHTLY && + ./curator snapshot-incomplete --target=$NIGHTLY && + ./curator snapshot && + stack --resolver ghc-$GHCVER exec ./curator check-snapshot