Ask Travis to use GHC 7.10 too.

This commit is contained in:
Dmitry Ivanov 2015-01-02 15:39:11 +06:00
parent 698035f5e6
commit 281ff48c3b
5 changed files with 15 additions and 12 deletions

View File

@ -5,13 +5,14 @@ notifications:
matrix:
allow_failures:
- env: GHCVER=head
- env: CABALVER=head GHCVER=head
env:
- GHCVER=7.4.2
- GHCVER=7.6.3
- GHCVER=7.8.2
- GHCVER=head
- CABALVER=1.20 GHCVER=7.4.2
- CABALVER=1.20 GHCVER=7.6.3
- CABALVER=1.20 GHCVER=7.8.3
- CABALVER=1.22 GHCVER=7.10.1
- CABALVER=head GHCVER=head
install:
- ./ci/travis_ci_install
@ -22,5 +23,5 @@ script:
before_install:
- sudo add-apt-repository -y ppa:hvr/ghc
- sudo apt-get update
- sudo apt-get install cabal-install-1.20 ghc-$GHCVER
- sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
- export PATH=/opt/ghc/$GHCVER/bin:$PATH

View File

@ -1,3 +1,5 @@
{-# LANGUAGE FlexibleContexts #-}
module Main where
import Graphics.Vty

View File

@ -2,8 +2,8 @@
set -ex
cabal --version
if [[ "${GHCVER}" > "7.2.2" ]] ; then
/opt/cabal/1.20/bin/cabal install --only-dependencies --enable-tests
/opt/cabal/${CABALVER}/bin/cabal install --only-dependencies --enable-tests
else
/opt/cabal/1.20/bin/cabal install --only-dependencies
/opt/cabal/${CABALVER}/bin/cabal install --only-dependencies
echo "Skipping test dependency install on ${GHCVER}"
fi

View File

@ -1,8 +1,8 @@
#!/bin/bash
set -ex
if [[ "${GHCVER}" > "7.2.2" ]] ; then
/opt/cabal/1.20/bin/cabal configure --enable-tests && /opt/cabal/1.20/bin/cabal build && /opt/cabal/1.20/bin/cabal test
/opt/cabal/${CABALVER}/bin/cabal configure --enable-tests && /opt/cabal/${CABALVER}/bin/cabal build && /opt/cabal/${CABALVER}/bin/cabal test
else
echo "Skipping tests on ${GHCVER}"
/opt/cabal/1.20/bin/cabal configure && /opt/cabal/1.20/bin/cabal build
/opt/cabal/${CABALVER}/bin/cabal configure && /opt/cabal/${CABALVER}/bin/cabal build
fi

View File

@ -47,10 +47,10 @@ library
bytestring,
containers,
data-default >= 0.5.3,
deepseq >= 1.1 && < 1.4,
deepseq >= 1.1 && < 1.5,
directory,
filepath >= 1.0 && < 2.0,
lens >= 3.9.0.2 && < 4.7,
lens >= 3.9.0.2 && < 4.8,
-- required for nice installation with yi
hashable >= 1.2,
mtl >= 1.1.1.0 && < 2.3,