From 68c93ccbb1c47f751636539e4ccaf560127bb839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Ch=C3=A9ron?= <olivier.cheron@gmail.com>
Date: Sat, 5 Oct 2019 08:23:45 +0200
Subject: [PATCH] Add GHC 8.8.1 to CI and bump versions

---
 .haskell-ci |  7 ++++---
 .travis.yml | 15 ++++++++-------
 stack.yaml  |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.haskell-ci b/.haskell-ci
index 17cb6a3..b0993fe 100644
--- a/.haskell-ci
+++ b/.haskell-ci
@@ -2,7 +2,8 @@
 compiler: ghc-8.0 lts-9.21
 compiler: ghc-8.2 lts-11.22
 compiler: ghc-8.4 lts-12.26
-compiler: ghc-8.6 lts-13.21
+compiler: ghc-8.6 lts-14.7
+compiler: ghc-8.8 nightly-2019-10-05
 
 # options
 # option: alias x=y z=v
@@ -12,9 +13,9 @@ option: basementmin extradep=basement-0.0.8 extradep=memory-0.14.18
 # builds
 build: ghc-8.2 basementmin
 build: ghc-8.0 basementmin gaugedeps
-build: ghc-8.0 basementmin gaugedeps os=osx
 build: ghc-8.4
-build: ghc-8.6
+build: ghc-8.6 os=linux,osx
+build: ghc-8.8
 
 # packages
 package: '.'
diff --git a/.travis.yml b/.travis.yml
index 4aa5de8..8e943fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# ~*~ auto-generated by haskell-ci with config : cb76551db808ad3472d36865246ef3849351a6c78535dd987bd37bc95bfd47c0 ~*~
+# ~*~ auto-generated by haskell-ci with config : 6451b289e8421706e753915b02cdb0906d18c9917aff02d07176a0862ec87cf3 ~*~
 
 # Use new container infrastructure to enable caching
 sudo: false
@@ -14,9 +14,10 @@ matrix:
   include:
   - { env: BUILD=stack RESOLVER=ghc-8.2, compiler: ghc-8.2, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
   - { env: BUILD=stack RESOLVER=ghc-8.0, compiler: ghc-8.0, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
-  - { env: BUILD=stack RESOLVER=ghc-8.0, compiler: ghc-8.0, language: generic, addons: { apt: { packages: [ libgmp-dev ] } }, os: osx }
   - { env: BUILD=stack RESOLVER=ghc-8.4, compiler: ghc-8.4, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
   - { env: BUILD=stack RESOLVER=ghc-8.6, compiler: ghc-8.6, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
+  - { env: BUILD=stack RESOLVER=ghc-8.6, compiler: ghc-8.6, language: generic, addons: { apt: { packages: [ libgmp-dev ] } }, os: osx }
+  - { env: BUILD=stack RESOLVER=ghc-8.8, compiler: ghc-8.8, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
   - { env: BUILD=hlint, compiler: hlint, language: generic }
   - { env: BUILD=weeder, compiler: weeder, language: generic, addons: { apt: { packages: [ libgmp-dev ] } } }
   allow_failures:
@@ -56,16 +57,16 @@ script:
         echo "{ resolver: lts-9.21, packages: [ '.' ], extra-deps: [ basement-0.0.8, memory-0.14.18, gauge-0.2.1 ], flags: {} }" > stack.yaml
         stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
         ;;
-      ghc-8.0)
-        echo "{ resolver: lts-9.21, packages: [ '.' ], extra-deps: [ basement-0.0.8, memory-0.14.18, gauge-0.2.1 ], flags: {} }" > stack.yaml
-        stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
-        ;;
       ghc-8.4)
         echo "{ resolver: lts-12.26, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
         stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
         ;;
       ghc-8.6)
-        echo "{ resolver: lts-13.21, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
+        echo "{ resolver: lts-14.7, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
+        stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
+        ;;
+      ghc-8.8)
+        echo "{ resolver: nightly-2019-10-05, packages: [ '.' ], extra-deps: [], flags: {} }" > stack.yaml
         stack --no-terminal build --install-ghc --coverage --test --bench --no-run-benchmarks --haddock --no-haddock-deps
         ;;
       esac
diff --git a/stack.yaml b/stack.yaml
index 85bc4e8..c48151a 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,3 +1,3 @@
-# ~*~ auto-generated by haskell-ci with config : cb76551db808ad3472d36865246ef3849351a6c78535dd987bd37bc95bfd47c0 ~*~
-{ resolver: lts-13.21, packages: [ '.' ], extra-deps: [], flags: {} }
+# ~*~ auto-generated by haskell-ci with config : 6451b289e8421706e753915b02cdb0906d18c9917aff02d07176a0862ec87cf3 ~*~
+{ resolver: lts-14.7, packages: [ '.' ], extra-deps: [], flags: {} }