git.iko.soy/servant
on master help sign in
Update .travis.yml

- Disable file-upload recipe (changed MkLink breaks released servant-multipart) - GHC-8.4.2 -> GHC-8.4.3

commit0b084afe6272fbd9ef8a1d8bec7f391d40d69a9d authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 1 Jun 2018, 13:42 (8 years ago) parent46663f2
18 files changed+27−29
compare with master
unifiedsplit
.travis.yml+8−12 cabal.project+3−1 doc/cookbook/basic-auth/basic-auth.cabal+1−1 doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1 doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1 doc/cookbook/file-upload/file-upload.cabal+1−1 doc/cookbook/https/https.cabal+1−1 doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1 doc/cookbook/pagination/pagination.cabal+1−1 doc/cookbook/structuring-apis/structuring-apis.cabal+1−1 doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1 doc/tutorial/tutorial.cabal+1−1 servant-client-core/servant-client-core.cabal+1−1 servant-client/servant-client.cabal+1−1 servant-docs/servant-docs.cabal+1−1 servant-foreign/servant-foreign.cabal+1−1 servant-server/servant-server.cabal+1−1 servant/servant.cabal+1−1
.travis.yml+8−12
@@ -33,9 +33,9 @@ before_cache:
3333
3434matrix:
3535 include:
36− - compiler: "ghc-8.4.2"
36+ - compiler: "ghc-8.4.3"
3737 # 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]}}
3939 - compiler: "ghc-8.2.2"
4040 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4141 addons: {apt: {packages: [ghc-ppa-tools,ghc-8.2.2], sources: [hvr-ghc]}}
@@ -83,9 +83,9 @@ install:
8383 - rm -fv cabal.project cabal.project.local
8484 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
8585 - 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"
8787 - "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"
8989 - cat cabal.project
9090 - if [ -f "servant/configure.ac" ]; then
9191 (cd "servant" && autoreconf -i);
@@ -117,9 +117,6 @@ install:
117117 - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then
118118 (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i);
119119 fi
120− - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then
121− (cd "doc/cookbook/file-upload" && autoreconf -i);
122− fi
123120 - if [ -f "doc/cookbook/https/configure.ac" ]; then
124121 (cd "doc/cookbook/https" && autoreconf -i);
125122 fi
@@ -133,7 +130,7 @@ install:
133130 (cd "doc/cookbook/using-custom-monad" && autoreconf -i);
134131 fi
135132 - 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
137134 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
138135
139136# Here starts the actual work to be performed for the package under test;
@@ -151,19 +148,18 @@ script:
151148 - (cd "doc/cookbook/basic-auth" && cabal sdist)
152149 - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)
153150 - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)
154− - (cd "doc/cookbook/file-upload" && cabal sdist)
155151 - (cd "doc/cookbook/https" && cabal sdist)
156152 - (cd "doc/cookbook/pagination" && cabal sdist)
157153 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
158154 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
159155 - echo -en 'travis_fold:end:sdist\\r'
160156 - 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}/
162158 - cd ${DISTDIR} || false
163159 - 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"
165161 - "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"
167163 - cat cabal.project
168164 - echo -en 'travis_fold:end:unpack\\r'
169165
cabal.project+3−1
@@ -11,8 +11,10 @@ packages: servant/
1111 doc/cookbook/basic-auth
1212 doc/cookbook/db-postgres-pool
1313 doc/cookbook/db-sqlite-simple
14− doc/cookbook/file-upload
14+ -- MkLink changed
15+ -- doc/cookbook/file-upload
1516 doc/cookbook/https
17+ -- servant-auth-* doesn't support GHC-8.4
1618 -- doc/cookbook/jwt-and-basic-auth
1719 doc/cookbook/pagination
1820 doc/cookbook/structuring-apis
doc/cookbook/basic-auth/basic-auth.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-basic-auth
1414 main-is: BasicAuth.lhs
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-db-postgres-pool
1414 main-is: PostgresPool.lhs
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-db-sqlite-simple
1414 main-is: DBConnection.lhs
doc/cookbook/file-upload/file-upload.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-file-upload
1414 main-is: FileUpload.lhs
doc/cookbook/https/https.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-https
1414 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
1111category: Servant
1212build-type: Simple
1313cabal-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
1515
1616executable cookbook-jwt-and-basic-auth
1717 if !impl(ghc >= 7.10)
doc/cookbook/pagination/pagination.cabal+1−1
@@ -11,7 +11,7 @@ cabal-version: >=1.10
1111extra-source-files:
1212 Pagination.lhs
1313 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
1515
1616executable cookbook-pagination
1717 main-is: Pagination.lhs
doc/cookbook/structuring-apis/structuring-apis.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-structuring-apis
1414 main-is: StructuringApis.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-using-custom-monad
1414 main-is: UsingCustomMonad.lhs
doc/tutorial/tutorial.cabal+1−1
@@ -17,7 +17,7 @@ tested-with:
1717 GHC==7.10.3
1818 GHC==8.0.2
1919 GHC==8.2.2
20− GHC==8.4.2
20+ GHC==8.4.3
2121extra-source-files:
2222 static/index.html
2323 static/ui.js
servant-client-core/servant-client-core.cabal+1−1
@@ -23,7 +23,7 @@ tested-with:
2323 GHC==7.10.3
2424 GHC==8.0.2
2525 GHC==8.2.2
26− GHC==8.4.2
26+ GHC==8.4.3
2727
2828source-repository head
2929 type: git
servant-client/servant-client.cabal+1−1
@@ -21,7 +21,7 @@ tested-with:
2121 GHC==7.10.3
2222 GHC==8.0.2
2323 GHC==8.2.2
24− GHC==8.4.2
24+ GHC==8.4.3
2525homepage: http://haskell-servant.readthedocs.org/
2626Bug-reports: http://github.com/haskell-servant/servant/issues
2727extra-source-files:
servant-docs/servant-docs.cabal+1−1
@@ -21,7 +21,7 @@ tested-with:
2121 GHC==7.10.3
2222 GHC==8.0.2
2323 GHC==8.2.2
24− GHC==8.4.2
24+ GHC==8.4.3
2525homepage: http://haskell-servant.readthedocs.org/
2626Bug-reports: http://github.com/haskell-servant/servant/issues
2727extra-source-files:
servant-foreign/servant-foreign.cabal+1−1
@@ -27,7 +27,7 @@ tested-with:
2727 GHC==7.10.3
2828 GHC==8.0.2
2929 GHC==8.2.2
30− GHC==8.4.2
30+ GHC==8.4.3
3131
3232source-repository head
3333 type: git
servant-server/servant-server.cabal+1−1
@@ -26,7 +26,7 @@ tested-with:
2626 GHC==7.10.3
2727 GHC==8.0.2
2828 GHC==8.2.2
29− GHC==8.4.2
29+ GHC==8.4.3
3030extra-source-files:
3131 include/*.h
3232 CHANGELOG.md
servant/servant.cabal+1−1
@@ -22,7 +22,7 @@ tested-with:
2222 GHC==7.10.3
2323 GHC==8.0.2
2424 GHC==8.2.2
25− GHC==8.4.2
25+ GHC==8.4.3
2626extra-source-files:
2727 include/*.h
2828 CHANGELOG.md