Merge pull request #92 from ethercrow/master
Fix ghc version comparison in travis scripts
commit5729ca6ffbee2b88ebd790b58b7becf19106ed9d
authorCorey O'Connor <coreyoconnor@gmail.com>
dateSun 17 Apr 2016, 10:46 (11 years ago)
parente6c979e0fbcf0a
.travis.yml+1
@@ -12,6 +12,7 @@ env:
1212 - CABALVER=1.20 GHCVER=7.6.3
1313 - CABALVER=1.20 GHCVER=7.8.3
1414 - CABALVER=1.22 GHCVER=7.10.1
15+ - CABALVER=1.24 GHCVER=8.0.1
1516 - CABALVER=head GHCVER=head
1617
1718install:
ci/travis_ci_install+4−1
@@ -1,7 +1,10 @@
11#!/bin/bash
22set -ex
33cabal --version
4−if [[ "${GHCVER}" > "7.2.2" ]] ; then
4+
5+GHC_IS_OLD=$(python -c "from distutils.version import StrictVersion as SV; print '$GHCVER' != 'head' and SV('$GHCVER') < SV('7.2.3')")
6+
7+if [[ "False" == "$GHC_IS_OLD" ]] ; then
58 /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies --enable-tests
69else
710 /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies
ci/travis_ci_script+4−1
@@ -1,6 +1,9 @@
11#!/bin/bash
22set -ex
3−if [[ "${GHCVER}" > "7.2.2" ]] ; then
3+
4+GHC_IS_OLD=$(python -c "from distutils.version import StrictVersion as SV; print '$GHCVER' != 'head' and SV('$GHCVER') < SV('7.2.3')")
5+
6+if [[ "False" == "$GHC_IS_OLD" ]] ; then
47 /opt/cabal/${CABALVER}/bin/cabal configure --enable-tests && /opt/cabal/${CABALVER}/bin/cabal build && /opt/cabal/${CABALVER}/bin/cabal test
58else
69 echo "Skipping tests on ${GHCVER}"