747b35d · typeable/servant

.travis.yml+20−23

compare with master

unifiedsplit

@@ -1,30 +1,27 @@

1−language: haskell

1+sudo: false

2

3−env:

3+addons:

4− - CABALVER=1.18 GHCVER=7.8.4

4+ apt:

5− - CABALVER=1.22 GHCVER=7.10.1

5+ packages:

6+ - libgmp-dev

6

7

7−before_install:

8+env:

8− - travis_retry sudo add-apt-repository -y ppa:hvr/ghc

9+ - STACK_YAML=stack-ghc-7.8.4.yaml

9− - travis_retry sudo apt-get update

10+ - STACK_YAML=stack.yaml

10− - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER

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

12− - travis_retry cabal update

13

11

14install:

12install:

15− - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"

13+ # stack

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

15+ - travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v0.1.4.0/stack-0.1.4.0-x86_64-linux.tar.gz | tar -xvzf -

16+ - mv stack ~/.local/bin

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

16− - cabal --version

18+ - stack --version

17

19

18script:

20script:

19− - ./scripts/test-all.sh

21+ - stack setup

22+ - stack build

23+ - stack test

20

24

21−notifications:

25+cache:

22− irc:

26+ directories:

23− channels:

27+ - $HOME/.stack

24− - "irc.freenode.org#servant"

25− template:

26− - "%{repository}#%{build_number} - %{commit} on %{branch} by %{author}: %{message}"

27− - "Build details: %{build_url} - Change view: %{compare_url}"

28− skip_join: true

29− on_success: change

30− on_failure: always

servant-mock/servant-mock.cabal+1−1

@@ -30,7 +30,7 @@ library

30 servant >= 0.4,

31 servant-server >= 0.4,

32 transformers >= 0.3 && <0.5,

33− QuickCheck >= 2.8 && <2.9,

33+ QuickCheck >= 2.7 && <2.9,

34 wai >= 3.0 && <3.1

35 hs-source-dirs: src

36 default-language: Haskell2010

stack-ghc-7.8.4.yamlnew file+22

@@ -0,0 +1,22 @@

1+flags: {}

2+packages:

3+- servant-examples/

4+- servant-docs/

5+- servant-blaze/

6+- servant-client/

7+- servant-lucid/

8+- servant-mock/

9+- servant-js/

10+- servant/

11+- servant-server/

12+extra-deps:

13+- hspec-2.2.0

14+- hspec-core-2.2.0

15+- hspec-discover-2.2.0

16+- hspec-expectations-0.7.2

17+- doctest-0.10.1

18+- engine-io-1.2.10

19+- engine-io-wai-1.0.3

20+- socket-io-1.3.3

21+- stm-delay-0.1.1.1

22+resolver: lts-2.22

stack.yaml+1−2

@@ -13,5 +13,4 @@ packages:

13- servant-server/

14extra-deps:

15- engine-io-wai-1.0.2

16−- attoparsec-0.13.0.1

17−resolver: nightly-2015-07-24

16+resolver: nightly-2015-09-05