From 256b908e0e2bf65812258c21b74d280f9a021cd4 Mon Sep 17 00:00:00 2001 From: Alexander Biehl Date: Tue, 3 Apr 2018 16:35:50 +0200 Subject: Travis: Build with ghc-8.4.2 (#793) --- .travis.yml | 4 ++-- haddock-api/haddock-api.cabal | 2 +- html-test/ref/Bug310.html | 4 ++-- html-test/ref/Bug548.html | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4afc18f4..39135739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,9 +26,9 @@ before_cache: matrix: include: - - compiler: "ghc-8.4.1" + - compiler: "ghc-8.4.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.2], sources: [hvr-ghc]}} - compiler: "ghc-head" # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}} diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal index f5803e09..acb4d9e4 100644 --- a/haddock-api/haddock-api.cabal +++ b/haddock-api/haddock-api.cabal @@ -169,7 +169,7 @@ test-suite spec build-depends: Cabal ^>= 2.0.0 , ghc ^>= 8.4 , ghc-paths ^>= 0.1.0.9 - , haddock-library ^>= 1.5.0 + , haddock-library ^>= 1.6.0 , xhtml ^>= 3000.2.2 , hspec ^>= 2.4.4 , QuickCheck ^>= 2.11 diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html index e8ce24f8..47da5387 100644 --- a/html-test/ref/Bug310.html +++ b/html-test/ref/Bug310.html @@ -89,7 +89,7 @@ >Addition of type-level naturals.

Since: 4.7.0.0Since: base-4.7.0.0

\ No newline at end of file +> diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html index 29216433..b32f8c8c 100644 --- a/html-test/ref/Bug548.html +++ b/html-test/ref/Bug548.html @@ -183,7 +183,7 @@ >

Since: 2.1Since: base-2.1

Since: 2.1Since: base-2.1

Since: 2.1Since: base-2.1

\ No newline at end of file +> -- cgit v1.2.3