git.iko.soy/typeable/servant
on master help sign in
Update .travis.yml
0b084afOleg Grenrus
.travis.yml+8−12
compare with master
unifiedsplit
@@ -33,9 +33,9 @@ before_cache:
33
33
34matrix:
34matrix:
35 include:
35 include:
36− - compiler: "ghc-8.4.2"
36+ - compiler: "ghc-8.4.3"
37 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37 # env: TEST=--disable-tests BENCH=--disable-benchmarks
38− addons: {apt: {packages: [ghc-ppa-tools,ghc-8.4.2], sources: [hvr-ghc]}}
38+ addons: {apt: {packages: [ghc-ppa-tools,ghc-8.4.3], sources: [hvr-ghc]}}
39 - compiler: "ghc-8.2.2"
39 - compiler: "ghc-8.2.2"
40 # env: TEST=--disable-tests BENCH=--disable-benchmarks
40 # env: TEST=--disable-tests BENCH=--disable-benchmarks
41 addons: {apt: {packages: [ghc-ppa-tools,ghc-8.2.2], sources: [hvr-ghc]}}
41 addons: {apt: {packages: [ghc-ppa-tools,ghc-8.2.2], sources: [hvr-ghc]}}
@@ -83,9 +83,9 @@ install:
83 - rm -fv cabal.project cabal.project.local
83 - rm -fv cabal.project cabal.project.local
84 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
84 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
85 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
85 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
86− - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/https\" \"doc/cookbook/pagination\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\"\\n' > cabal.project"
86+ - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/https\" \"doc/cookbook/pagination\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\"\\n' > cabal.project"
87 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
87 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
88− - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server, http-media:base' >> cabal.project"
88+ - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base' >> cabal.project"
89 - cat cabal.project
89 - cat cabal.project
90 - if [ -f "servant/configure.ac" ]; then
90 - if [ -f "servant/configure.ac" ]; then
91 (cd "servant" && autoreconf -i);
91 (cd "servant" && autoreconf -i);
@@ -117,9 +117,6 @@ install:
117 - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then
117 - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then
118 (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i);
118 (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i);
119 fi
119 fi
120− - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then
121− (cd "doc/cookbook/file-upload" && autoreconf -i);
122− fi
123 - if [ -f "doc/cookbook/https/configure.ac" ]; then
120 - if [ -f "doc/cookbook/https/configure.ac" ]; then
124 (cd "doc/cookbook/https" && autoreconf -i);
121 (cd "doc/cookbook/https" && autoreconf -i);
125 fi
122 fi
@@ -133,7 +130,7 @@ install:
133 (cd "doc/cookbook/using-custom-monad" && autoreconf -i);
130 (cd "doc/cookbook/using-custom-monad" && autoreconf -i);
134 fi
131 fi
135 - rm -f cabal.project.freeze
132 - rm -f cabal.project.freeze
136− - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/https"/dist "doc/cookbook/pagination"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist
133+ - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/https"/dist "doc/cookbook/pagination"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist
137 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
134 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
138
135
139# Here starts the actual work to be performed for the package under test;
136# Here starts the actual work to be performed for the package under test;
@@ -151,19 +148,18 @@ script:
151 - (cd "doc/cookbook/basic-auth" && cabal sdist)
148 - (cd "doc/cookbook/basic-auth" && cabal sdist)
152 - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)
149 - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)
153 - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)
150 - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)
154− - (cd "doc/cookbook/file-upload" && cabal sdist)
155 - (cd "doc/cookbook/https" && cabal sdist)
151 - (cd "doc/cookbook/https" && cabal sdist)
156 - (cd "doc/cookbook/pagination" && cabal sdist)
152 - (cd "doc/cookbook/pagination" && cabal sdist)
157 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
153 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
158 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
154 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
159 - echo -en 'travis_fold:end:sdist\\r'
155 - echo -en 'travis_fold:end:sdist\\r'
160 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
156 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
161− - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/pagination"/dist/cookbook-pagination-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz ${DISTDIR}/
157+ - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/pagination"/dist/cookbook-pagination-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz ${DISTDIR}/
162 - cd ${DISTDIR} || false
158 - cd ${DISTDIR} || false
163 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
159 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
164− - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-https-*/*.cabal cookbook-pagination-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal\\n' > cabal.project"
160+ - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-https-*/*.cabal cookbook-pagination-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal\\n' > cabal.project"
165 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
161 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
166− - "echo 'allow-newer: servant-js:servant,servant-js:servant-foreign,servant-auth-server:http-types,servant-multipart:lens,servant-multipart:resourcet,servant-multipart:servant,servant-multipart:servant-server,servant-auth-server:servant-server, http-media:base' >> cabal.project"
162+ - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base' >> cabal.project"
167 - cat cabal.project
163 - cat cabal.project
168 - echo -en 'travis_fold:end:unpack\\r'
164 - echo -en 'travis_fold:end:unpack\\r'
169
165
cabal.project+3−1
@@ -11,8 +11,10 @@ packages: servant/
11 doc/cookbook/basic-auth
11 doc/cookbook/basic-auth
12 doc/cookbook/db-postgres-pool
12 doc/cookbook/db-postgres-pool
13 doc/cookbook/db-sqlite-simple
13 doc/cookbook/db-sqlite-simple
14+ -- MkLink changed
14− doc/cookbook/file-upload
15+ -- doc/cookbook/file-upload
15 doc/cookbook/https
16 doc/cookbook/https
17+ -- servant-auth-* doesn't support GHC-8.4
16 -- doc/cookbook/jwt-and-basic-auth
18 -- doc/cookbook/jwt-and-basic-auth
17 doc/cookbook/pagination
19 doc/cookbook/pagination
18 doc/cookbook/structuring-apis
20 doc/cookbook/structuring-apis
doc/cookbook/basic-auth/basic-auth.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
12
12
13executable cookbook-basic-auth
13executable cookbook-basic-auth
14 main-is: BasicAuth.lhs
14 main-is: BasicAuth.lhs
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
12
12
13executable cookbook-db-postgres-pool
13executable cookbook-db-postgres-pool
14 main-is: PostgresPool.lhs
14 main-is: PostgresPool.lhs
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
12
12
13executable cookbook-db-sqlite-simple
13executable cookbook-db-sqlite-simple
14 main-is: DBConnection.lhs
14 main-is: DBConnection.lhs
doc/cookbook/file-upload/file-upload.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
12
12
13executable cookbook-file-upload
13executable cookbook-file-upload
14 main-is: FileUpload.lhs
14 main-is: FileUpload.lhs
doc/cookbook/https/https.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
12
12
13executable cookbook-https
13executable cookbook-https
14 main-is: Https.lhs
14 main-is: Https.lhs
doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1
@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
11category: Servant
11category: Servant
12build-type: Simple
12build-type: Simple
13cabal-version: >=1.10
13cabal-version: >=1.10
14−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
14+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
15
15
16executable cookbook-jwt-and-basic-auth
16executable cookbook-jwt-and-basic-auth
17 if !impl(ghc >= 7.10)
17 if !impl(ghc >= 7.10)
doc/cookbook/pagination/pagination.cabal+1−1
@@ -11,7 +11,7 @@ cabal-version: >=1.10
11extra-source-files:
11extra-source-files:
12 Pagination.lhs
12 Pagination.lhs
13 dummy/Pagination.lhs
13 dummy/Pagination.lhs
14−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
14+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
15
15
16executable cookbook-pagination
16executable cookbook-pagination
17 main-is: Pagination.lhs
17 main-is: Pagination.lhs
doc/cookbook/structuring-apis/structuring-apis.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
12
12
13executable cookbook-structuring-apis
13executable cookbook-structuring-apis
14 main-is: StructuringApis.lhs
14 main-is: StructuringApis.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
8maintainer: haskell-servant-maintainers@googlegroups.com
8maintainer: haskell-servant-maintainers@googlegroups.com
9build-type: Simple
9build-type: Simple
10cabal-version: >=1.10
10cabal-version: >=1.10
11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
12
12
13executable cookbook-using-custom-monad
13executable cookbook-using-custom-monad
14 main-is: UsingCustomMonad.lhs
14 main-is: UsingCustomMonad.lhs
doc/tutorial/tutorial.cabal+1−1
@@ -17,7 +17,7 @@ tested-with:
17 GHC==7.10.3
17 GHC==7.10.3
18 GHC==8.0.2
18 GHC==8.0.2
19 GHC==8.2.2
19 GHC==8.2.2
20− GHC==8.4.2
20+ GHC==8.4.3
21extra-source-files:
21extra-source-files:
22 static/index.html
22 static/index.html
23 static/ui.js
23 static/ui.js
servant-client-core/servant-client-core.cabal+1−1
@@ -23,7 +23,7 @@ tested-with:
23 GHC==7.10.3
23 GHC==7.10.3
24 GHC==8.0.2
24 GHC==8.0.2
25 GHC==8.2.2
25 GHC==8.2.2
26− GHC==8.4.2
26+ GHC==8.4.3
27
27
28source-repository head
28source-repository head
29 type: git
29 type: git
servant-client/servant-client.cabal+1−1
@@ -21,7 +21,7 @@ tested-with:
21 GHC==7.10.3
21 GHC==7.10.3
22 GHC==8.0.2
22 GHC==8.0.2
23 GHC==8.2.2
23 GHC==8.2.2
24− GHC==8.4.2
24+ GHC==8.4.3
25homepage: http://haskell-servant.readthedocs.org/
25homepage: http://haskell-servant.readthedocs.org/
26Bug-reports: http://github.com/haskell-servant/servant/issues
26Bug-reports: http://github.com/haskell-servant/servant/issues
27extra-source-files:
27extra-source-files:
servant-docs/servant-docs.cabal+1−1
@@ -21,7 +21,7 @@ tested-with:
21 GHC==7.10.3
21 GHC==7.10.3
22 GHC==8.0.2
22 GHC==8.0.2
23 GHC==8.2.2
23 GHC==8.2.2
24− GHC==8.4.2
24+ GHC==8.4.3
25homepage: http://haskell-servant.readthedocs.org/
25homepage: http://haskell-servant.readthedocs.org/
26Bug-reports: http://github.com/haskell-servant/servant/issues
26Bug-reports: http://github.com/haskell-servant/servant/issues
27extra-source-files:
27extra-source-files:
servant-foreign/servant-foreign.cabal+1−1
@@ -27,7 +27,7 @@ tested-with:
27 GHC==7.10.3
27 GHC==7.10.3
28 GHC==8.0.2
28 GHC==8.0.2
29 GHC==8.2.2
29 GHC==8.2.2
30− GHC==8.4.2
30+ GHC==8.4.3
31
31
32source-repository head
32source-repository head
33 type: git
33 type: git
servant-server/servant-server.cabal+1−1
@@ -26,7 +26,7 @@ tested-with:
26 GHC==7.10.3
26 GHC==7.10.3
27 GHC==8.0.2
27 GHC==8.0.2
28 GHC==8.2.2
28 GHC==8.2.2
29− GHC==8.4.2
29+ GHC==8.4.3
30extra-source-files:
30extra-source-files:
31 include/*.h
31 include/*.h
32 CHANGELOG.md
32 CHANGELOG.md
servant/servant.cabal+1−1
@@ -22,7 +22,7 @@ tested-with:
22 GHC==7.10.3
22 GHC==7.10.3
23 GHC==8.0.2
23 GHC==8.0.2
24 GHC==8.2.2
24 GHC==8.2.2
25− GHC==8.4.2
25+ GHC==8.4.3
26extra-source-files:
26extra-source-files:
27 include/*.h
27 include/*.h
28 CHANGELOG.md
28 CHANGELOG.md