git.iko.soy/typeable/servant
on master help sign in
Merge pull request #237 from sol/master
fdd1829Julian Arni
.travis.yml+19−13
compare with master
unifiedsplit
@@ -1,26 +1,32 @@
1sudo: false
1sudo: false
2
2
3+language: c
4+
5+env:
6+ - GHCVER=7.8.4
7+ - GHCVER=7.10.2
8+
3addons:
9addons:
4 apt:
10 apt:
11+ sources:
12+ - hvr-ghc
5 packages:
13 packages:
14+ - ghc-7.8.4
15+ - ghc-7.10.2
16+ - cabal-install-1.22
6 - libgmp-dev
17 - libgmp-dev
7
18
8−env:
9− - STACK_YAML=stack-ghc-7.8.4.yaml
10− - STACK_YAML=stack.yaml
11−
12install:
19install:
13− # stack
20+ - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
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
21+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH
22+ - ghc --version
18− - stack --version
23+ - cabal --version
24+ - travis_retry cabal update
25+ - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
19
26
20script:
27script:
21− - stack setup
28+ - for package in $(cat sources.txt); do (cd $package && tinc && cabal configure --enable-tests --disable-optimization && cabal build && cabal test) || exit 1; done
22− - stack build --test --ghc-options "-Werror"
23
29
24cache:
30cache:
25 directories:
31 directories:
26− - $HOME/.stack
32+ - $HOME/.tinc/cache
servant-blaze/tinc.yamlnew file+3
@@ -0,0 +1,3 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
servant-cassava/tinc.yamlnew file+3
@@ -0,0 +1,3 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
servant-client/tinc.yamlnew file+5
@@ -0,0 +1,5 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
4+ - name: servant-server
5+ path: ../servant-server
servant-docs/tinc.yamlnew file+3
@@ -0,0 +1,3 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
servant-examples/tinc.yamlnew file+15
@@ -0,0 +1,15 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
4+ - name: servant-server
5+ path: ../servant-server
6+ - name: servant-client
7+ path: ../servant-client
8+ - name: servant-js
9+ path: ../servant-js
10+ - name: servant-lucid
11+ path: ../servant-lucid
12+ - name: servant-docs
13+ path: ../servant-docs
14+ - name: servant-foreign
15+ path: ../servant-foreign
servant-examples/tutorial/T1.hs+3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
1{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE TypeFamilies #-}
4{-# LANGUAGE TypeFamilies #-}
@@ -17,10 +18,12 @@ data User = User
17 , registration_date :: Day
18 , registration_date :: Day
18 } deriving (Eq, Show, Generic)
19 } deriving (Eq, Show, Generic)
19
20
21+#if !MIN_VERSION_aeson(0,10,0)
20-- orphan ToJSON instance for Day. necessary to derive one for User
22-- orphan ToJSON instance for Day. necessary to derive one for User
21instance ToJSON Day where
23instance ToJSON Day where
22 -- display a day in YYYY-mm-dd format
24 -- display a day in YYYY-mm-dd format
23 toJSON d = toJSON (showGregorian d)
25 toJSON d = toJSON (showGregorian d)
26+#endif
24
27
25instance ToJSON User
28instance ToJSON User
26
29
servant-examples/tutorial/T2.hs+3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
1{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE TypeFamilies #-}
4{-# LANGUAGE TypeFamilies #-}
@@ -17,10 +18,12 @@ data User = User
17 , registration_date :: Day
18 , registration_date :: Day
18 } deriving (Eq, Show, Generic)
19 } deriving (Eq, Show, Generic)
19
20
21+#if !MIN_VERSION_aeson(0,10,0)
20-- orphan ToJSON instance for Day. necessary to derive one for User
22-- orphan ToJSON instance for Day. necessary to derive one for User
21instance ToJSON Day where
23instance ToJSON Day where
22 -- display a day in YYYY-mm-dd format
24 -- display a day in YYYY-mm-dd format
23 toJSON d = toJSON (showGregorian d)
25 toJSON d = toJSON (showGregorian d)
26+#endif
24
27
25instance ToJSON User
28instance ToJSON User
26
29
servant-foreign/tinc.yamlnew file+3
@@ -0,0 +1,3 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
servant-js/tinc.yamlnew file+7
@@ -0,0 +1,7 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
4+ - name: servant-server
5+ path: ../servant-server
6+ - name: servant-foreign
7+ path: ../servant-foreign
servant-lucid/tinc.yamlnew file+3
@@ -0,0 +1,3 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
servant-mock/tinc.yamlnew file+5
@@ -0,0 +1,5 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant
4+ - name: servant-server
5+ path: ../servant-server
servant-server/tinc.yamlnew file+3
@@ -0,0 +1,3 @@
1+dependencies:
2+ - name: servant
3+ path: ../servant