diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2018-07-13 10:28:29 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2018-07-13 10:28:29 -0700 |
| commit | d6cbc7ba378d8725d37303f9d07167d751fca6af (patch) | |
| tree | 03ac3ad8510c25be98bd4bde6c0be64fa7238f02 | |
| parent | 23e6e8e2214dce3d61c28931c7697e6a41087a04 (diff) | |
| download | pandoc-d6cbc7ba378d8725d37303f9d07167d751fca6af.tar.gz | |
Travis: Use system ghc. And use ghc-8.4.3 instead of 8.4.2.
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | pandoc.cabal | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index a202b6c63..6d7454b4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,9 +45,9 @@ matrix: compiler: ": #GHC 8.2.2" addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5], sources: [hvr-ghc]}} - - env: BUILD=cabal GHCVER=8.4.2 CABALVER=2.2 OPTS="-O0 -Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS="--enable-benchmarks" - compiler: ": #GHC 8.4.2" - addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.2,happy-1.19.5], sources: [hvr-ghc]}} + - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 OPTS="-O0 -Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS="--enable-benchmarks" + compiler: ": #GHC 8.4.3" + addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3,happy-1.19.5], sources: [hvr-ghc]}} # Build with the newest GHC and cabal-install. This is an accepted failure, # see below. @@ -63,12 +63,12 @@ matrix: - env: BUILD=stack ARGS="--resolver lts-12" OPTS="-Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" compiler: ": #stack 8.2.2" - addons: {apt: {packages: [ghc-8.2.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-8.4.3], sources: [hvr-ghc]}} # Nightly builds are allowed to fail - env: BUILD=stack ARGS="--resolver nightly" OPTS="-Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" compiler: ": #stack nightly" - addons: {apt: {packages: [ghc-8.2.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-8.4.3], sources: [hvr-ghc]}} # - env: BUILD=stack ARGS="--resolver lts-8" # compiler: ": #stack 8.0.2 osx" diff --git a/pandoc.cabal b/pandoc.cabal index b5bf36f67..4bd386948 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -11,7 +11,7 @@ bug-reports: https://github.com/jgm/pandoc/issues stability: alpha homepage: https://pandoc.org category: Text -tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.2 +tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3 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 |