Test also on ghc 7.4.2.

Made make_travis_yml.hs a bit more robust.
This commit is contained in:
John MacFarlane 2015-10-09 14:44:32 -07:00
parent 114103d67f
commit 3687dc36d5
3 changed files with 6 additions and 3 deletions

View file

@ -13,6 +13,9 @@ before_cache:
matrix:
include:
- env: CABALVER=1.16 GHCVER=7.4.2 GHCOPTS=-Werror
compiler: ": #GHC 7.4.2"
addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
- env: CABALVER=1.16 GHCVER=7.6.3 GHCOPTS=-Werror
compiler: ": #GHC 7.6.3"
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}

View file

@ -4,7 +4,7 @@
import Control.Monad
import Data.List
import Data.Version (makeVersion)
import Data.Version
import System.Environment
import System.Exit
import System.IO
@ -89,7 +89,7 @@ genTravisFromCabalFile fn xpkgs = do
forM_ testedGhcVersions $ \gv -> do
let cvs = disp' (lookupCabVer gv)
gvs = disp' gv
ghcopts = if gv >= makeVersion [7,10,0]
ghcopts = if gv >= Version [7,10,0] []
then ""
else "-Werror"

View file

@ -11,7 +11,7 @@ Bug-Reports: https://github.com/jgm/pandoc/issues
Stability: alpha
Homepage: http://pandoc.org
Category: Text
Tested-With: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2
Tested-With: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2
Synopsis: Conversion between markup formats
Description: Pandoc is a Haskell library for converting from one markup
format to another, and a command-line tool that uses