git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1231 from hdgarrood/travis-ghc-7.6
b197ac5Phil Freeman
.travis.yml+4−2
@@ -1,6 +1,8 @@
1env:
1env:
2− - CABALVER=1.22 GHCVER=7.8.3 SUITE=tests
2+ - CABALVER=1.22 GHCVER=7.8.3 COVERAGE_SUITE=tests
3− - CABALVER=1.22 GHCVER=7.8.3 SUITE=psci-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
4before_install:
6before_install:
5 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
7 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
6 - travis_retry sudo apt-get update
8 - travis_retry sudo apt-get update
travis-after-script.sh+3−3
@@ -6,16 +6,16 @@ pushd core-tests/
6
6
7popd
7popd
8
8
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" ]
10then
10then
11 cabal install hpc-coveralls
11 cabal install hpc-coveralls
12− case "$SUITE" in
12+ case "$COVERAGE_SUITE" in
13 "tests")
13 "tests")
14 hpc-coveralls --exclude-dir=dist/build/autogen --exclude-dir=tests tests;;
14 hpc-coveralls --exclude-dir=dist/build/autogen --exclude-dir=tests tests;;
15 "psci-tests")
15 "psci-tests")
16 hpc-coveralls --exclude-dir=dist/build/autogen --exclude-dir=src --exclude-dir=psci/tests psci-tests;;
16 hpc-coveralls --exclude-dir=dist/build/autogen --exclude-dir=src --exclude-dir=psci/tests psci-tests;;
17 *)
17 *)
18− echo "unrecognised test suite $SUITE"
18+ echo "unrecognised test suite $COVERAGE_SUITE"
19 exit 1;;
19 exit 1;;
20 esac
20 esac
21fi
21fi
travis-script.sh+1−1
@@ -1,6 +1,6 @@
1set -e
1set -e
2
2
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" ]
4then
4then
5 cabal configure --enable-tests --enable-coverage -v2
5 cabal configure --enable-tests --enable-coverage -v2
6else
6else