Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Travis: test with ghc 8.0.1, remove testing with ghc 7.4.

Browse source
This commit is contained in:
John MacFarlane 2016-06-04 07:36:15 -07:00
parent 9a77544813
commit 34510949ca
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.travis.yml
View file

@ -28,9 +28,6 @@ matrix:
include: include:
# We grab the appropriate GHC and cabal-install versions from hvr's PPA. See: # We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
# https://github.com/hvr/multi-ghc-travis # 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 - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16
compiler: ": #GHC 7.6.3" compiler: ": #GHC 7.6.3"
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}} addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
@ -41,6 +38,10 @@ matrix:
compiler: ": #GHC 7.10.3" compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}} 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, # Build with the newest GHC and cabal-install. This is an accepted failure,
# see below. # see below.
- env: BUILD=cabal GHCVER=head CABALVER=head - env: BUILD=cabal GHCVER=head CABALVER=head
@ -53,6 +54,10 @@ matrix:
compiler: ": #stack 7.10.3" compiler: ": #stack 7.10.3"
addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}} 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 # Nightly builds are allowed to fail
- env: BUILD=stack ARGS="--resolver nightly" - env: BUILD=stack ARGS="--resolver nightly"
compiler: ": #stack nightly" compiler: ": #stack nightly"
@ -62,6 +67,10 @@ matrix:
compiler: ": #stack 7.10.3 osx" compiler: ": #stack 7.10.3 osx"
os: osx os: osx
- env: BUILD=stack ARGS="--resolver lts-6"
compiler: ": #stack 7.10.3 osx"
os: osx
- env: BUILD=stack ARGS="--resolver nightly" - env: BUILD=stack ARGS="--resolver nightly"
compiler: ": #stack nightly osx" compiler: ": #stack nightly osx"
os: osx os: osx

2
pandoc.cabal
View file

@ -11,7 +11,7 @@ Bug-Reports: https://github.com/jgm/pandoc/issues
Stability: alpha Stability: alpha
Homepage: http://pandoc.org Homepage: http://pandoc.org
Category: Text 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 Synopsis: Conversion between markup formats
Description: Pandoc is a Haskell library for converting from one markup Description: Pandoc is a Haskell library for converting from one markup
format to another, and a command-line tool that uses format to another, and a command-line tool that uses