78e0b32 · servant-quickcheck

git.iko.soy/servant-quickcheck

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

Fix ci

commit78e0b3201905be05a8b795a5af15a83001479e59 authorJulian Arni <jkarni@gmail.com> dateFri 10 Mar 2017, 21:48 (10 years ago) parentbe5909d b7cf4e6

6 files changed+38−29

compare with master

unifiedsplit

.travis.yml+20−15 servant-quickcheck.cabal+1−1 stack-ghc-8.0.1.yaml−10 stack-lts-6.yaml+6 stack-lts-7.yaml+6 stack.yaml+5−3

.travis.yml+20−15

@@ -2,25 +2,30 @@ sudo: false

33language: c

5−matrix:

6− include:

7− - env: CABALVER=1.22 GHCVER=7.10.1

8− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}}

9− - env: CABALVER=1.24 GHCVER=8.0.1

10− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}

5+env:

6+ - STACK_YAML=stack.yaml

7+ - STACK_YAML=stack-lts-7.yaml

8+ - STACK_YAML=stack-lts-6.yaml

10+

11+addons:

12+ apt:

13+ packages: libgmp-dev

14+

1115

1216install:

13− - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)

14− - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH

15− - ghc --version

16− - cabal --version

17− - travis_retry cabal update

18− - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config

17+ # stack

18+ - mkdir -p ~/.local/bin

19+ - export PATH=~/.local/bin:$PATH

20+ - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

21+ - stack --version

1922

2023script:

21− - tinc && cabal configure --enable-tests && cabal build && cabal test

22− - cabal check

24+ - stack setup --no-terminal

25+ - stack build --ghc-options=-Werror --no-terminal

26+ - stack test --ghc-options=-Werror --no-terminal --coverage

27+ - stack haddock --no-terminal

2328

2429cache:

2530 directories:

26− - $HOME/.tinc/cache

31+ - $HOME/.stack

servant-quickcheck.cabal+1−1

@@ -38,7 +38,7 @@ library

3838 , case-insensitive == 1.2.*

3939 , clock >= 0.7 && < 0.8

4040 , data-default-class >= 0.0 && < 0.2

41− , hspec == 2.2.*

41+ , hspec >= 2.2 && < 2.4

4242 , http-client >= 0.4.30 && < 0.6

4343 , http-media == 0.6.*

4444 , http-types > 0.8 && < 0.10

stack-ghc-8.0.1.yamldeleted−10

@@ -1,10 +0,0 @@

1−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)

2−resolver: nightly-2016-10-03

3−packages:

4−- '.'

5−extra-deps:

6−- 'servant-0.9'

7−- 'servant-server-0.9'

8−- 'servant-client-0.9'

9−flags: {}

10−extra-package-dbs: []

stack-lts-6.yamlnew file+6

@@ -0,0 +1,6 @@

1+resolver: lts-6.30

2+packages:

3+- '.'

4+extra-deps: []

5+flags: {}

6+extra-package-dbs: []

stack-lts-7.yamlnew file+6

@@ -0,0 +1,6 @@

1+resolver: lts-7.19

2+packages:

3+- '.'

4+extra-deps: []

5+flags: {}

6+extra-package-dbs: []

stack.yaml+5−3

@@ -1,7 +1,9 @@

1−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)

2−resolver: lts-6.17

1+resolver: lts-8.4

32packages:

43- '.'

5−extra-deps: []

4+extra-deps:

5+- hspec-2.3.2

6+- hspec-core-2.3.2

7+- hspec-discover-2.3.2

68flags: {}

79extra-package-dbs: []