git.iko.soy/vty
on master help sign in
Merge pull request #66 from ethercrow/master

Ask Travis to use GHC 7.10 too.

commitdb91e4d5fc01ad83a11d9b265e5fa0a746aac787 authorCorey O'Connor <coreyoconnor@gmail.com> dateSat 10 Jan 2015, 12:22 (12 years ago) parent698035f281ff48
5 files changed+15−12
compare with master
unifiedsplit
.travis.yml+7−6 Demo.hs+2 ci/travis_ci_install+2−2 ci/travis_ci_script+2−2 vty.cabal+2−2
.travis.yml+7−6
@@ -5,13 +5,14 @@ notifications:
55
66matrix:
77 allow_failures:
8− - env: GHCVER=head
8+ - env: CABALVER=head GHCVER=head
99
1010env:
11− - GHCVER=7.4.2
12− - GHCVER=7.6.3
13− - GHCVER=7.8.2
14− - GHCVER=head
11+ - CABALVER=1.20 GHCVER=7.4.2
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=head GHCVER=head
1516
1617install:
1718 - ./ci/travis_ci_install
@@ -22,5 +23,5 @@ script:
2223before_install:
2324 - sudo add-apt-repository -y ppa:hvr/ghc
2425 - sudo apt-get update
25− - sudo apt-get install cabal-install-1.20 ghc-$GHCVER
26+ - sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
2627 - export PATH=/opt/ghc/$GHCVER/bin:$PATH
Demo.hs+2
@@ -1,3 +1,5 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+
13module Main where
24
35import Graphics.Vty
ci/travis_ci_install+2−2
@@ -2,8 +2,8 @@
22set -ex
33cabal --version
44if [[ "${GHCVER}" > "7.2.2" ]] ; then
5− /opt/cabal/1.20/bin/cabal install --only-dependencies --enable-tests
5+ /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies --enable-tests
66else
7− /opt/cabal/1.20/bin/cabal install --only-dependencies
7+ /opt/cabal/${CABALVER}/bin/cabal install --only-dependencies
88 echo "Skipping test dependency install on ${GHCVER}"
99fi
ci/travis_ci_script+2−2
@@ -1,8 +1,8 @@
11#!/bin/bash
22set -ex
33if [[ "${GHCVER}" > "7.2.2" ]] ; then
4− /opt/cabal/1.20/bin/cabal configure --enable-tests && /opt/cabal/1.20/bin/cabal build && /opt/cabal/1.20/bin/cabal test
4+ /opt/cabal/${CABALVER}/bin/cabal configure --enable-tests && /opt/cabal/${CABALVER}/bin/cabal build && /opt/cabal/${CABALVER}/bin/cabal test
55else
66 echo "Skipping tests on ${GHCVER}"
7− /opt/cabal/1.20/bin/cabal configure && /opt/cabal/1.20/bin/cabal build
7+ /opt/cabal/${CABALVER}/bin/cabal configure && /opt/cabal/${CABALVER}/bin/cabal build
88fi
vty.cabal+2−2
@@ -47,10 +47,10 @@ library
4747 bytestring,
4848 containers,
4949 data-default >= 0.5.3,
50− deepseq >= 1.1 && < 1.4,
50+ deepseq >= 1.1 && < 1.5,
5151 directory,
5252 filepath >= 1.0 && < 2.0,
53− lens >= 3.9.0.2 && < 4.7,
53+ lens >= 3.9.0.2 && < 4.8,
5454 -- required for nice installation with yi
5555 hashable >= 1.2,
5656 mtl >= 1.1.1.0 && < 2.3,