From a8dd02516f0d1cce5e458f138831339523cf3847 Mon Sep 17 00:00:00 2001
From: "Julian K. Arni" <jkarni@gmail.com>
Date: Fri, 10 Mar 2017 15:36:45 -0600
Subject: [PATCH] Switch CI to stack

---
 .travis.yml              | 35 ++++++++++++++++++++---------------
 servant-quickcheck.cabal |  2 +-
 stack-ghc-8.0.1.yaml     | 10 ----------
 stack-lts-6.yaml         |  6 ++++++
 stack-lts-7.yaml         |  6 ++++++
 stack.yaml               |  3 +--
 6 files changed, 34 insertions(+), 28 deletions(-)
 delete mode 100644 stack-ghc-8.0.1.yaml
 create mode 100644 stack-lts-6.yaml
 create mode 100644 stack-lts-7.yaml

diff --git a/.travis.yml b/.travis.yml
index 4437ad7..3374614 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,25 +2,30 @@ sudo: false
 
 language: c
 
-matrix:
-  include:
-    - env: CABALVER=1.22 GHCVER=7.10.1
-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}}
-    - env: CABALVER=1.24 GHCVER=8.0.1
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1],  sources: [hvr-ghc]}}
+env:
+  - STACK_YAML=stack.yaml
+  - STACK_YAML=stack-lts-7.yaml
+  - STACK_YAML=stack-lts-6.yaml
+
+
+addons:
+  apt:
+    packages: libgmp-dev
+
 
 install:
-  - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
-  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
-  - ghc --version
-  - cabal --version
-  - travis_retry cabal update
-  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
+  # stack
+  - mkdir -p ~/.local/bin
+  - export PATH=~/.local/bin:$PATH
+  - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+  - stack --version
 
 script:
-  - tinc && cabal configure --enable-tests && cabal build && cabal test
-  - cabal check
+  - stack setup --no-terminal
+  - stack build --ghc-options=-Werror --no-terminal
+  - stack test --ghc-options=-Werror --no-terminal --coverage
+  - stack haddock --no-terminal
 
 cache:
   directories:
-    - $HOME/.tinc/cache
+    - $HOME/.stack
diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal
index 4f9b2bd..925b646 100644
--- a/servant-quickcheck.cabal
+++ b/servant-quickcheck.cabal
@@ -38,7 +38,7 @@ library
                      , case-insensitive == 1.2.*
                      , clock >= 0.7 && < 0.8
                      , data-default-class >= 0.0 && < 0.2
-                     , hspec == 2.2.*
+                     , hspec >= 2.2 && < 2.5
                      , http-client >= 0.4.30 && < 0.6
                      , http-media == 0.6.*
                      , http-types > 0.8 && < 0.10
diff --git a/stack-ghc-8.0.1.yaml b/stack-ghc-8.0.1.yaml
deleted file mode 100644
index e92c0d3..0000000
--- a/stack-ghc-8.0.1.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: nightly-2016-10-03
-packages:
-- '.'
-extra-deps:
-- 'servant-0.9'
-- 'servant-server-0.9'
-- 'servant-client-0.9'
-flags: {}
-extra-package-dbs: []
diff --git a/stack-lts-6.yaml b/stack-lts-6.yaml
new file mode 100644
index 0000000..19f07c3
--- /dev/null
+++ b/stack-lts-6.yaml
@@ -0,0 +1,6 @@
+resolver: lts-6.30
+packages:
+- '.'
+extra-deps: []
+flags: {}
+extra-package-dbs: []
diff --git a/stack-lts-7.yaml b/stack-lts-7.yaml
new file mode 100644
index 0000000..5ffaec4
--- /dev/null
+++ b/stack-lts-7.yaml
@@ -0,0 +1,6 @@
+resolver: lts-7.19
+packages:
+- '.'
+extra-deps: []
+flags: {}
+extra-package-dbs: []
diff --git a/stack.yaml b/stack.yaml
index c301d0b..f51bdc9 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,4 @@
-# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-6.17
+resolver: lts-8.4
 packages:
 - '.'
 extra-deps: []