diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-06-04 07:36:15 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-06-04 07:36:15 -0700 |
| commit | 34510949ca89dd6fe613ae11c0422d0506d72a29 (patch) | |
| tree | de617d3f7043264aaea842617937116b7198a994 | |
| parent | 9a77544813fb0a40d43ecbbddfad55976aea8ddb (diff) | |
| download | pandoc-34510949ca89dd6fe613ae11c0422d0506d72a29.tar.gz | |
Travis: test with ghc 8.0.1, remove testing with ghc 7.4.
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | pandoc.cabal | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 3c3ff3425..4c89760fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,6 @@ matrix: include: # We grab the appropriate GHC and cabal-install versions from hvr's PPA. See: # https://github.com/hvr/multi-ghc-travis - - env: BUILD=cabal GHCVER=7.4.2 CABALVER=1.16 - compiler: ": #GHC 7.4.2" - addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}} - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16 compiler: ": #GHC 7.6.3" addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}} @@ -41,6 +38,10 @@ matrix: compiler: ": #GHC 7.10.3" addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}} + - env: BUILD=cabal GHCVER=8.0.1 CABALVER=1.24 + compiler: ": #GHC 8.0.1" + addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}} + # Build with the newest GHC and cabal-install. This is an accepted failure, # see below. - env: BUILD=cabal GHCVER=head CABALVER=head @@ -53,6 +54,10 @@ matrix: compiler: ": #stack 7.10.3" addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}} + - env: BUILD=stack ARGS="--resolver lts-6" + compiler: ": #stack 7.10.3" + addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}} + # Nightly builds are allowed to fail - env: BUILD=stack ARGS="--resolver nightly" compiler: ": #stack nightly" @@ -62,6 +67,10 @@ matrix: compiler: ": #stack 7.10.3 osx" os: osx + - env: BUILD=stack ARGS="--resolver lts-6" + compiler: ": #stack 7.10.3 osx" + os: osx + - env: BUILD=stack ARGS="--resolver nightly" compiler: ": #stack nightly osx" os: osx diff --git a/pandoc.cabal b/pandoc.cabal index aa17192de..b18ad3aee 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.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2 +Tested-With: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1 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 |