5729ca6 · vty · git.iko.soy

on master help sign in

Merge pull request #92 from ethercrow/master

5729ca6Corey O'Connor11 years ago

.travis.yml+1

@@ -12,6 +12,7 @@ env:

12 - CABALVER=1.20 GHCVER=7.6.3

13 - CABALVER=1.20 GHCVER=7.8.3

14 - CABALVER=1.22 GHCVER=7.10.1

15+ - CABALVER=1.24 GHCVER=8.0.1

15 - CABALVER=head GHCVER=head

16 - CABALVER=head GHCVER=head

17install:

18install:

ci/travis_ci_install+4−1

@@ -1,7 +1,10 @@

1#!/bin/bash

2set -ex

3cabal --version

4−if [[ "${GHCVER}" > "7.2.2" ]] ; then

5+GHC_IS_OLD=$(python -c "from distutils.version import StrictVersion as SV; print '$GHCVER' != 'head' and SV('$GHCVER') < SV('7.2.3')")

7+if [[ "False" == "$GHC_IS_OLD" ]] ; then

5 /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies --enable-tests

8 /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies --enable-tests

6else

9else

7 /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies

10 /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies

ci/travis_ci_script+4−1

@@ -1,6 +1,9 @@

1#!/bin/bash

2set -ex

3−if [[ "${GHCVER}" > "7.2.2" ]] ; then

4+GHC_IS_OLD=$(python -c "from distutils.version import StrictVersion as SV; print '$GHCVER' != 'head' and SV('$GHCVER') < SV('7.2.3')")

6+if [[ "False" == "$GHC_IS_OLD" ]] ; then

4 /opt/cabal/${CABALVER}/bin/cabal configure --enable-tests && /opt/cabal/${CABALVER}/bin/cabal build && /opt/cabal/${CABALVER}/bin/cabal test

7 /opt/cabal/${CABALVER}/bin/cabal configure --enable-tests && /opt/cabal/${CABALVER}/bin/cabal build && /opt/cabal/${CABALVER}/bin/cabal test

5else

8else

6 echo "Skipping tests on ${GHCVER}"

9 echo "Skipping tests on ${GHCVER}"