b197ac5 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Merge pull request #1231 from hdgarrood/travis-ghc-7.6

Run Travis build on GHC 7.6

commitb197ac520c8427a102477fc0abda8485f8409ebe authorPhil Freeman <paf31@cantab.net> dateTue 7 Jul 2015, 10:20 (11 years ago) parent6f20955 b37f315

3 files changed+8−6

unifiedsplit

.travis.yml+4−2

@@ -1,6 +1,8 @@

11env:

2− - CABALVER=1.22 GHCVER=7.8.3 SUITE=tests

3− - CABALVER=1.22 GHCVER=7.8.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

5+ - CABALVER=1.22 GHCVER=7.10.1

46before_install:

57 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc

68 - travis_retry sudo apt-get update

travis-after-script.sh+3−3

@@ -6,16 +6,16 @@ pushd core-tests/

77popd

9−if [ -z $( git describe --tags --exact-match 2>/dev/null ) ]

9+if [ -z $( git describe --tags --exact-match 2>/dev/null ) && -n "$COVERAGE_SUITE" ]

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

3−if [ -z $( git describe --tags --exact-match 2>/dev/null ) ]

3+if [ -z $( git describe --tags --exact-match 2>/dev/null ) && -n "$COVERAGE_SUITE" ]

44then

55 cabal configure --enable-tests --enable-coverage -v2

66else