git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1123 from haskell-servant/travis-update-2

Update travis once again

commit132f7eb3d69866136da820f370e164d2e2302d38 authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 12 Feb 2019, 10:43 (8 years ago) parent32ccc2d525b74c
29 files changed+115−114
compare with master
unifiedsplit
.travis.yml+85−85 cabal.haskell-ci+3−2 doc/cookbook/basic-auth/basic-auth.cabal+1−1 doc/cookbook/basic-streaming/basic-streaming.cabal+1−1 doc/cookbook/curl-mock/curl-mock.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/generic/generic.cabal+1−1 doc/cookbook/hoist-server-with-context/hoist-server-with-context.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/sentry/sentry.cabal+1−1 doc/cookbook/structuring-apis/structuring-apis.cabal+1−1 doc/cookbook/testing/testing.cabal+1−1 doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1 doc/cookbook/using-free-client/using-free-client.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-conduit/servant-conduit.cabal+1−1 servant-docs/servant-docs.cabal+1−1 servant-foreign/servant-foreign.cabal+1−1 servant-http-streams/servant-http-streams.cabal+1−1 servant-machines/servant-machines.cabal+1−1 servant-pipes/servant-pipes.cabal+1−1 servant-server/servant-server.cabal+1−1 servant/servant.cabal+1−1
.travis.yml+85−85
@@ -32,9 +32,9 @@ before_cache:
3232
3333matrix:
3434 include:
35− - compiler: "ghc-8.6.2"
35+ - compiler: "ghc-8.6.3"
3636 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.2], sources: [hvr-ghc]}}
37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
3838 - compiler: "ghc-8.4.4"
3939 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4040 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
@@ -60,16 +60,40 @@ install:
6060 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
6161 - BENCH=${BENCH---enable-benchmarks}
6262 - TEST=${TEST---enable-tests}
63− - HADDOCK=${HADDOCK-true}
6463 - UNCONSTRAINED=${UNCONSTRAINED-true}
65− - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
6664 - GHCHEAD=${GHCHEAD-false}
6765 - travis_retry cabal update -v
6866 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
6967 - rm -fv cabal.project cabal.project.local
70− - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
68+ - "sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config"
7169 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
72− - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-http-streams\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"servant-machines\" \"servant-conduit\" \"servant-pipes\" \"doc/cookbook/basic-auth\" \"doc/cookbook/curl-mock\" \"doc/cookbook/basic-streaming\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/hoist-server-with-context\" \"doc/cookbook/https\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/testing\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/using-free-client\"\\n' > cabal.project"
70+ - rm -f cabal.project
71+ - touch cabal.project
72+ - "printf 'packages: \"servant\"\\n' >> cabal.project"
73+ - "printf 'packages: \"servant-client\"\\n' >> cabal.project"
74+ - "printf 'packages: \"servant-client-core\"\\n' >> cabal.project"
75+ - "printf 'packages: \"servant-http-streams\"\\n' >> cabal.project"
76+ - "printf 'packages: \"servant-docs\"\\n' >> cabal.project"
77+ - "printf 'packages: \"servant-foreign\"\\n' >> cabal.project"
78+ - "printf 'packages: \"servant-server\"\\n' >> cabal.project"
79+ - "printf 'packages: \"doc/tutorial\"\\n' >> cabal.project"
80+ - "printf 'packages: \"servant-machines\"\\n' >> cabal.project"
81+ - "printf 'packages: \"servant-conduit\"\\n' >> cabal.project"
82+ - "printf 'packages: \"servant-pipes\"\\n' >> cabal.project"
83+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/basic-auth\"\\n' >> cabal.project ; fi"
84+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/curl-mock\"\\n' >> cabal.project ; fi"
85+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/basic-streaming\"\\n' >> cabal.project ; fi"
86+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/db-postgres-pool\"\\n' >> cabal.project ; fi"
87+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/db-sqlite-simple\"\\n' >> cabal.project ; fi"
88+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/file-upload\"\\n' >> cabal.project ; fi"
89+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/generic\"\\n' >> cabal.project ; fi"
90+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/hoist-server-with-context\"\\n' >> cabal.project ; fi"
91+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/https\"\\n' >> cabal.project ; fi"
92+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/jwt-and-basic-auth\"\\n' >> cabal.project ; fi"
93+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/testing\"\\n' >> cabal.project ; fi"
94+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/structuring-apis\"\\n' >> cabal.project ; fi"
95+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/using-custom-monad\"\\n' >> cabal.project ; fi"
96+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/using-free-client\"\\n' >> cabal.project ; fi"
7397 - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
7498 - "echo 'constraints: foundation >=0.0.14' >> cabal.project"
7599 - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"
@@ -81,84 +105,34 @@ install:
81105 - "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project"
82106 - "echo 'optimization: False' >> cabal.project "
83107 - touch cabal.project.local
84− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-http-streams | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
108+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-hoist-server-with-context|cookbook-https|cookbook-jwt-and-basic-auth|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
85109 - cat cabal.project || true
86110 - cat cabal.project.local || true
87− - if [ -f "servant/configure.ac" ]; then
88− (cd "servant" && autoreconf -i);
89− fi
90− - if [ -f "servant-client/configure.ac" ]; then
91− (cd "servant-client" && autoreconf -i);
92− fi
93− - if [ -f "servant-client-core/configure.ac" ]; then
94− (cd "servant-client-core" && autoreconf -i);
95− fi
96− - if [ -f "servant-http-streams/configure.ac" ]; then
97− (cd "servant-http-streams" && autoreconf -i);
98− fi
99− - if [ -f "servant-docs/configure.ac" ]; then
100− (cd "servant-docs" && autoreconf -i);
101− fi
102− - if [ -f "servant-foreign/configure.ac" ]; then
103− (cd "servant-foreign" && autoreconf -i);
104− fi
105− - if [ -f "servant-server/configure.ac" ]; then
106− (cd "servant-server" && autoreconf -i);
107− fi
108− - if [ -f "doc/tutorial/configure.ac" ]; then
109− (cd "doc/tutorial" && autoreconf -i);
110− fi
111− - if [ -f "servant-machines/configure.ac" ]; then
112− (cd "servant-machines" && autoreconf -i);
113− fi
114− - if [ -f "servant-conduit/configure.ac" ]; then
115− (cd "servant-conduit" && autoreconf -i);
116− fi
117− - if [ -f "servant-pipes/configure.ac" ]; then
118− (cd "servant-pipes" && autoreconf -i);
119− fi
120− - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then
121− (cd "doc/cookbook/basic-auth" && autoreconf -i);
122− fi
123− - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then
124− (cd "doc/cookbook/curl-mock" && autoreconf -i);
125− fi
126− - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then
127− (cd "doc/cookbook/basic-streaming" && autoreconf -i);
128− fi
129− - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then
130− (cd "doc/cookbook/db-postgres-pool" && autoreconf -i);
131− fi
132− - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then
133− (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i);
134− fi
135− - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then
136− (cd "doc/cookbook/file-upload" && autoreconf -i);
137− fi
138− - if [ -f "doc/cookbook/generic/configure.ac" ]; then
139− (cd "doc/cookbook/generic" && autoreconf -i);
140− fi
141− - if [ -f "doc/cookbook/hoist-server-with-context/configure.ac" ]; then
142− (cd "doc/cookbook/hoist-server-with-context" && autoreconf -i);
143− fi
144− - if [ -f "doc/cookbook/https/configure.ac" ]; then
145− (cd "doc/cookbook/https" && autoreconf -i);
146− fi
147− - if [ -f "doc/cookbook/jwt-and-basic-auth/configure.ac" ]; then
148− (cd "doc/cookbook/jwt-and-basic-auth" && autoreconf -i);
149− fi
150− - if [ -f "doc/cookbook/testing/configure.ac" ]; then
151− (cd "doc/cookbook/testing" && autoreconf -i);
152− fi
153− - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then
154− (cd "doc/cookbook/structuring-apis" && autoreconf -i);
155− fi
156− - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then
157− (cd "doc/cookbook/using-custom-monad" && autoreconf -i);
158− fi
159− - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then
160− (cd "doc/cookbook/using-free-client" && autoreconf -i);
161− fi
111+ - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
112+ - if [ -f "servant-client/configure.ac" ]; then (cd "servant-client" && autoreconf -i); fi
113+ - if [ -f "servant-client-core/configure.ac" ]; then (cd "servant-client-core" && autoreconf -i); fi
114+ - if [ -f "servant-http-streams/configure.ac" ]; then (cd "servant-http-streams" && autoreconf -i); fi
115+ - if [ -f "servant-docs/configure.ac" ]; then (cd "servant-docs" && autoreconf -i); fi
116+ - if [ -f "servant-foreign/configure.ac" ]; then (cd "servant-foreign" && autoreconf -i); fi
117+ - if [ -f "servant-server/configure.ac" ]; then (cd "servant-server" && autoreconf -i); fi
118+ - if [ -f "doc/tutorial/configure.ac" ]; then (cd "doc/tutorial" && autoreconf -i); fi
119+ - if [ -f "servant-machines/configure.ac" ]; then (cd "servant-machines" && autoreconf -i); fi
120+ - if [ -f "servant-conduit/configure.ac" ]; then (cd "servant-conduit" && autoreconf -i); fi
121+ - if [ -f "servant-pipes/configure.ac" ]; then (cd "servant-pipes" && autoreconf -i); fi
122+ - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then (cd "doc/cookbook/basic-auth" && autoreconf -i); fi
123+ - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi
124+ - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi
125+ - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then (cd "doc/cookbook/db-postgres-pool" && autoreconf -i); fi
126+ - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i); fi
127+ - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi
128+ - if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi
129+ - if [ -f "doc/cookbook/hoist-server-with-context/configure.ac" ]; then (cd "doc/cookbook/hoist-server-with-context" && autoreconf -i); fi
130+ - if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi
131+ - if [ -f "doc/cookbook/jwt-and-basic-auth/configure.ac" ]; then (cd "doc/cookbook/jwt-and-basic-auth" && autoreconf -i); fi
132+ - if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi
133+ - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
134+ - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
135+ - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi
162136 - rm -f cabal.project.freeze
163137 - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-http-streams"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "servant-machines"/dist "servant-conduit"/dist "servant-pipes"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/curl-mock"/dist "doc/cookbook/basic-streaming"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/generic"/dist "doc/cookbook/hoist-server-with-context"/dist "doc/cookbook/https"/dist "doc/cookbook/jwt-and-basic-auth"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist
164138 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
@@ -174,7 +148,33 @@ script:
174148 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
175149 - cd ${DISTDIR} || false
176150 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
177− - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-http-streams-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal servant-machines-*/*.cabal servant-conduit-*/*.cabal servant-pipes-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-curl-mock-*/*.cabal cookbook-basic-streaming-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-hoist-server-with-context-*/*.cabal cookbook-https-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-testing-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-using-free-client-*/*.cabal\\n' > cabal.project"
151+ - rm -f cabal.project
152+ - touch cabal.project
153+ - "printf 'packages: \"servant-*/*.cabal\"\\n' >> cabal.project"
154+ - "printf 'packages: \"servant-client-*/*.cabal\"\\n' >> cabal.project"
155+ - "printf 'packages: \"servant-client-core-*/*.cabal\"\\n' >> cabal.project"
156+ - "printf 'packages: \"servant-http-streams-*/*.cabal\"\\n' >> cabal.project"
157+ - "printf 'packages: \"servant-docs-*/*.cabal\"\\n' >> cabal.project"
158+ - "printf 'packages: \"servant-foreign-*/*.cabal\"\\n' >> cabal.project"
159+ - "printf 'packages: \"servant-server-*/*.cabal\"\\n' >> cabal.project"
160+ - "printf 'packages: \"tutorial-*/*.cabal\"\\n' >> cabal.project"
161+ - "printf 'packages: \"servant-machines-*/*.cabal\"\\n' >> cabal.project"
162+ - "printf 'packages: \"servant-conduit-*/*.cabal\"\\n' >> cabal.project"
163+ - "printf 'packages: \"servant-pipes-*/*.cabal\"\\n' >> cabal.project"
164+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-basic-auth-*/*.cabal\"\\n' >> cabal.project ; fi"
165+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-curl-mock-*/*.cabal\"\\n' >> cabal.project ; fi"
166+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-basic-streaming-*/*.cabal\"\\n' >> cabal.project ; fi"
167+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-db-postgres-pool-*/*.cabal\"\\n' >> cabal.project ; fi"
168+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-db-sqlite-simple-*/*.cabal\"\\n' >> cabal.project ; fi"
169+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-file-upload-*/*.cabal\"\\n' >> cabal.project ; fi"
170+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-generic-*/*.cabal\"\\n' >> cabal.project ; fi"
171+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-hoist-server-with-context-*/*.cabal\"\\n' >> cabal.project ; fi"
172+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-https-*/*.cabal\"\\n' >> cabal.project ; fi"
173+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-jwt-and-basic-auth-*/*.cabal\"\\n' >> cabal.project ; fi"
174+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-testing-*/*.cabal\"\\n' >> cabal.project ; fi"
175+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-structuring-apis-*/*.cabal\"\\n' >> cabal.project ; fi"
176+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-using-custom-monad-*/*.cabal\"\\n' >> cabal.project ; fi"
177+ - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-using-free-client-*/*.cabal\"\\n' >> cabal.project ; fi"
178178 - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
179179 - "echo 'constraints: foundation >=0.0.14' >> cabal.project"
180180 - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"
@@ -186,7 +186,7 @@ script:
186186 - "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project"
187187 - "echo 'optimization: False' >> cabal.project "
188188 - touch cabal.project.local
189− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-http-streams | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
189+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-hoist-server-with-context|cookbook-https|cookbook-jwt-and-basic-auth|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
190190 - cat cabal.project || true
191191 - cat cabal.project.local || true
192192 - echo -en 'travis_fold:end:unpack\\r'
@@ -199,7 +199,7 @@ script:
199199
200200 - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
201201 # haddock
202− - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
202+ - cabal new-haddock -w ${HC} ${TEST} ${BENCH} all
203203
204204 - echo -en 'travis_fold:end:haddock\\r'
205205# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]
cabal.haskell-ci+3−2
@@ -1,12 +1,13 @@
11folds: all-but-test
22branches: master
3+jobs-selection: any
34
45-- We have inplace packages (servant-js) so we skip installing dependencies in a separate step
5−install-dependencies-step: False
6+install-dependencies: False
67
78-- this speed-ups the build a little, but we have to check these for release
89no-tests-no-benchmarks: False
9−unconstrained-step: False
10+unconstrained: False
1011
1112-- Don't run cabal check, as cookbook examples won't pass it
1213cabal-check: False
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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-basic-auth
1414 main-is: BasicAuth.lhs
doc/cookbook/basic-streaming/basic-streaming.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-basic-streaming
1414 main-is: Streaming.lhs
doc/cookbook/curl-mock/curl-mock.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbock-curl-mock
1414 main-is: CurlMock.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-file-upload
1414 main-is: FileUpload.lhs
doc/cookbook/generic/generic.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-using-custom-monad
1414 main-is: Generic.lhs
doc/cookbook/hoist-server-with-context/hoist-server-with-context.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
14+tested-with: GHC==8.4.4, GHC==8.6.3
1515
1616executable cookbook-hoist-server-with-context
1717 main-is: HoistServerWithContext.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
14+tested-with: GHC==8.4.4, GHC==8.6.3
1515
1616executable cookbook-jwt-and-basic-auth
1717 main-is: JWTAndBasicAuth.lhs
doc/cookbook/pagination/pagination.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-pagination
1414 main-is: Pagination.lhs
doc/cookbook/sentry/sentry.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-sentry
1414 main-is: Sentry.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-structuring-apis
1414 main-is: StructuringApis.lhs
doc/cookbook/testing/testing.cabal+1−1
@@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1010category: Servant
1111build-type: Simple
1212cabal-version: >=1.10
13−tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
13+tested-with: GHC==8.4.4, GHC==8.6.3
1414
1515executable cookbook-testing
1616 main-is: Testing.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-using-custom-monad
1414 main-is: UsingCustomMonad.lhs
doc/cookbook/using-free-client/using-free-client.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==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
11+tested-with: GHC==8.4.4, GHC==8.6.3
1212
1313executable cookbook-using-free-client
1414 main-is: UsingFreeClient.lhs
doc/tutorial/tutorial.cabal+1−1
@@ -16,7 +16,7 @@ tested-with:
1616 GHC==8.0.2
1717 GHC==8.2.2
1818 GHC==8.4.4
19− GHC==8.6.2
19+ GHC==8.6.3
2020extra-source-files:
2121 static/index.html
2222 static/ui.js
servant-client-core/servant-client-core.cabal+1−1
@@ -20,7 +20,7 @@ tested-with:
2020 GHC ==8.0.2
2121 || ==8.2.2
2222 || ==8.4.4
23− || ==8.6.2
23+ || ==8.6.3
2424
2525extra-source-files:
2626 CHANGELOG.md
servant-client/servant-client.cabal+1−1
@@ -25,7 +25,7 @@ tested-with:
2525 GHC ==8.0.2
2626 || ==8.2.2
2727 || ==8.4.4
28− || ==8.6.2
28+ || ==8.6.3
2929
3030extra-source-files:
3131 CHANGELOG.md
servant-conduit/servant-conduit.cabal+1−1
@@ -20,7 +20,7 @@ tested-with:
2020 GHC ==8.0.2
2121 || ==8.2.2
2222 || ==8.4.4
23− || ==8.6.2
23+ || ==8.6.3
2424
2525extra-source-files:
2626 CHANGELOG.md
servant-docs/servant-docs.cabal+1−1
@@ -23,7 +23,7 @@ tested-with:
2323 GHC ==8.0.2
2424 || ==8.2.2
2525 || ==8.4.4
26− || ==8.6.2
26+ || ==8.6.3
2727
2828extra-source-files:
2929 CHANGELOG.md
servant-foreign/servant-foreign.cabal+1−1
@@ -25,7 +25,7 @@ tested-with:
2525 GHC ==8.0.2
2626 || ==8.2.2
2727 || ==8.4.4
28− || ==8.6.2
28+ || ==8.6.3
2929
3030extra-source-files:
3131 CHANGELOG.md
servant-http-streams/servant-http-streams.cabal+1−1
@@ -24,7 +24,7 @@ tested-with:
2424 GHC ==8.0.2
2525 || ==8.2.2
2626 || ==8.4.4
27− || ==8.6.2
27+ || ==8.6.3
2828
2929extra-source-files:
3030 CHANGELOG.md
servant-machines/servant-machines.cabal+1−1
@@ -20,7 +20,7 @@ tested-with:
2020 GHC ==8.0.2
2121 || ==8.2.2
2222 || ==8.4.4
23− || ==8.6.2
23+ || ==8.6.3
2424
2525extra-source-files:
2626 CHANGELOG.md
servant-pipes/servant-pipes.cabal+1−1
@@ -20,7 +20,7 @@ tested-with:
2020 GHC ==8.0.2
2121 || ==8.2.2
2222 || ==8.4.4
23− || ==8.6.2
23+ || ==8.6.3
2424
2525extra-source-files:
2626 CHANGELOG.md
servant-server/servant-server.cabal+1−1
@@ -27,7 +27,7 @@ tested-with:
2727 GHC ==8.0.2
2828 || ==8.2.2
2929 || ==8.4.4
30− || ==8.6.2
30+ || ==8.6.3
3131
3232extra-source-files:
3333 CHANGELOG.md
servant/servant.cabal+1−1
@@ -24,7 +24,7 @@ tested-with:
2424 GHC ==8.0.2
2525 || ==8.2.2
2626 || ==8.4.4
27− || ==8.6.2
27+ || ==8.6.3
2828
2929extra-source-files:
3030 CHANGELOG.md