Don't do more Travis builds than necessary
Also rename SUITE to the more descriptive COVERAGE_SUITE
commit3b0dd2d6a1db1255f22ace262d3e68445e49716f
authorHarry Garrood <harry@garrood.me>
dateSun 5 Jul 2015, 12:14 (11 years ago)
parentaf57e04
.travis.yml+3−4
@@ -1,8 +1,7 @@
11env:
2− - CABALVER=1.22 GHCVER=7.8.3 TRAVIS_COVERAGE=true SUITE=tests
3− - CABALVER=1.22 GHCVER=7.8.3 TRAVIS_COVERAGE=true SUITE=psci-tests
4− - CABALVER=1.22 GHCVER=7.6.3 SUITE=tests
5− - CABALVER=1.22 GHCVER=7.6.3 SUITE=psci-tests
2+ - CABALVER=1.22 GHCVER=7.8.3 COVERAGE_SUITE=tests
3+ - CABALVER=1.22 GHCVER=7.8.3 COVERAGE_SUITE=psci-tests
4+ - CABALVER=1.22 GHCVER=7.6.3
65before_install:
76 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
87 - travis_retry sudo apt-get update
travis-after-script.sh+2−2
@@ -9,13 +9,13 @@ popd
99if [ -z $( git describe --tags --exact-match 2>/dev/null ) ]
1010then
1111 cabal install hpc-coveralls
12− case "$SUITE" in
12+ case "$COVERAGE_SUITE" in
1313 "tests")
1414 hpc-coveralls --exclude-dir=dist/build/autogen --exclude-dir=tests tests;;
1515 "psci-tests")
1616 hpc-coveralls --exclude-dir=dist/build/autogen --exclude-dir=src --exclude-dir=psci/tests psci-tests;;
1717 *)
18− echo "unrecognised test suite $SUITE"
18+ echo "unrecognised test suite $COVERAGE_SUITE"
1919 exit 1;;
2020 esac
2121fi
travis-script.sh+1−1
@@ -1,6 +1,6 @@
11set -e
22
3−if [ -z $( git describe --tags --exact-match 2>/dev/null ) && "$TRAVIS_COVERAGE" = "true" ]
3+if [ -z $( git describe --tags --exact-match 2>/dev/null ) && -n "$COVERAGE_SUITE" ]
44then
55 cabal configure --enable-tests --enable-coverage -v2
66else