Merge pull request #26 from haskell-servant/fix-ci

Fix ci

.travis.yml

@@ -2,25 +2,30 @@ sudo: false
 
 language: c
 
-matrix:
+env:
-  include:
+  - STACK_YAML=stack.yaml
-    - env: CABALVER=1.22 GHCVER=7.10.1
+  - STACK_YAML=stack-lts-7.yaml
-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}}
+  - STACK_YAML=stack-lts-6.yaml
-    - env: CABALVER=1.24 GHCVER=8.0.1
+
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1],  sources: [hvr-ghc]}}
+
+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)
+  # stack
-  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+  - mkdir -p ~/.local/bin
-  - ghc --version
+  - export PATH=~/.local/bin:$PATH
-  - cabal --version
+  - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
-  - travis_retry cabal update
+  - stack --version
-  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
 
 script:
-  - tinc && cabal configure --enable-tests && cabal build && cabal test
+  - stack setup --no-terminal
-  - cabal check
+  - 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

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.4
                      , http-client >= 0.4.30 && < 0.6
                      , http-media == 0.6.*
                      , http-types > 0.8 && < 0.10

stack-ghc-8.0.1.yaml

@@ -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: []

stack-lts-6.yaml

@@ -0,0 +1,6 @@
+resolver: lts-6.30
+packages:
+- '.'
+extra-deps: []
+flags: {}
+extra-package-dbs: []

stack-lts-7.yaml

@@ -0,0 +1,6 @@
+resolver: lts-7.19
+packages:
+- '.'
+extra-deps: []
+flags: {}
+extra-package-dbs: []

stack.yaml

@@ -1,7 +1,9 @@
-# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
+resolver: lts-8.4
-resolver: lts-6.17
 packages:
 - '.'
-extra-deps: []
+extra-deps:
+- hspec-2.3.2
+- hspec-core-2.3.2
+- hspec-discover-2.3.2
 flags: {}
 extra-package-dbs: []