From 3687dc36d584ed1758898e2ce612ff96f1d9f6a5 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 9 Oct 2015 14:44:32 -0700 Subject: Test also on ghc 7.4.2. Made make_travis_yml.hs a bit more robust. --- .travis.yml | 3 +++ make_travis_yml.hs | 4 ++-- pandoc.cabal | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 310824d9e..6079e61c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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]}} diff --git a/make_travis_yml.hs b/make_travis_yml.hs index aa520c7d7..c01e8e0c9 100644 --- a/make_travis_yml.hs +++ b/make_travis_yml.hs @@ -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" diff --git a/pandoc.cabal b/pandoc.cabal index ccd8aa022..1f85d203d 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -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 -- cgit v1.2.3