git.iko.soy/typeable/servant
on master help sign in
Regenerate .travis.yml; GHC-8.6.5; add GHCJS
commitecbc04bbeeb6a0c1d3a546e52784c1e9a5fbe459 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSat 7 Sep 2019, 11:46 (7 years ago) parent7de93f9
30 files changed+177−119
.travis.yml+141−91 cabal.haskell-ci+3 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/open-id-connect/OpenIdConnect.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+2−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+5−1
.travis.yml+141−91
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.3.20190521
7+# version: 0.5.20180907
88#
99language: c
1010dist: xenial
@@ -29,23 +29,46 @@ before_cache:
2929 - rm -rfv $CABALHOME/packages/head.hackage
3030matrix:
3131 include:
32− - compiler: ghc-8.6.4
33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
32+ - compiler: ghcjs-8.4
33+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}
34+ - compiler: ghc-8.6.5
35+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
3436 - compiler: ghc-8.4.4
35− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
37+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
3638 - compiler: ghc-8.2.2
37− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
39+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
3840 - compiler: ghc-8.0.2
39− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
41+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
4042before_install:
43+ - |
44+ if echo $CC | grep -q ghcjs; then
45+ GHCJS=true;
46+ else
47+ GHCJS=false;
48+ fi
49+ - |
50+ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
51+ if $GHCJS ; then sudo add-apt-repository -y ppa:hvr/ghcjs ; fi;
52+ if $GHCJS ; then curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add - ; fi;
53+ if $GHCJS ; then sudo apt-add-repository 'https://deb.nodesource.com/node_8.x xenial main' ; fi;
54+ if $GHCJS ; then sudo apt-get update ; fi;
55+ sudo apt-get install $CC;
56+ if $GHCJS ; then sudo apt-get install -y nodejs cabal-install-3.0 ; fi;
57+ fi
4158 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
59+ - WITHCOMPILER="-w $HC"
60+ - if $GHCJS ; then HC=${HC}js ; fi
61+ - if $GHCJS ; then WITHCOMPILER="--ghcjs ${WITHCOMPILER}js" ; fi
62+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
63+ - if $GHCJS ; then sudo apt-get install -y ghc-8.4.4 ; fi
64+ - if $GHCJS ; then PATH="/opt/ghc/8.4.4/bin:$PATH" ; fi
4265 - HCPKG="$HC-pkg"
4366 - unset CC
4467 - CABAL=/opt/ghc/bin/cabal
4568 - CABALHOME=$HOME/.cabal
4669 - export PATH="$CABALHOME/bin:$PATH"
4770 - TOP=$(pwd)
48− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
71+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
4972 - echo $HCNUMVER
5073 - CABAL="$CABAL -vnormal+nowrap+markoutput"
5174 - set -o pipefail
@@ -70,13 +93,16 @@ before_install:
7093install:
7194 - ${CABAL} --version
7295 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
96+ - node --version
97+ - echo $GHCJS
7398 - TEST=--enable-tests
7499 - BENCH=--enable-benchmarks
75− - GHCHEAD=${GHCHEAD-false}
100+ - HEADHACKAGE=false
76101 - rm -f $CABALHOME/config
77102 - |
78103 echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
79104 echo "remote-build-reporting: anonymous" >> $CABALHOME/config
105+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
80106 echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
81107 echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
82108 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
@@ -95,50 +121,50 @@ install:
95121 - cat $CABALHOME/config
96122 - rm -fv cabal.project cabal.project.local cabal.project.freeze
97123 - travis_retry ${CABAL} v2-update -v
124+ - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 hspec-discover | color_cabal_output) ; fi
98125 # Generate cabal.project
99126 - rm -rf cabal.project cabal.project.local cabal.project.freeze
100127 - touch cabal.project
101128 - |
102− echo 'packages: "servant"' >> cabal.project
103− echo 'packages: "servant-client"' >> cabal.project
104− echo 'packages: "servant-client-core"' >> cabal.project
105− echo 'packages: "servant-http-streams"' >> cabal.project
106− echo 'packages: "servant-docs"' >> cabal.project
107− echo 'packages: "servant-foreign"' >> cabal.project
108− echo 'packages: "servant-server"' >> cabal.project
109− echo 'packages: "doc/tutorial"' >> cabal.project
110− echo 'packages: "servant-machines"' >> cabal.project
111− echo 'packages: "servant-conduit"' >> cabal.project
112− echo 'packages: "servant-pipes"' >> cabal.project
113− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/basic-auth"' >> cabal.project ; fi
114− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/curl-mock"' >> cabal.project ; fi
115− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/basic-streaming"' >> cabal.project ; fi
116− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/db-postgres-pool"' >> cabal.project ; fi
117− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/db-sqlite-simple"' >> cabal.project ; fi
118− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/file-upload"' >> cabal.project ; fi
119− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/generic"' >> cabal.project ; fi
120− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/https"' >> cabal.project ; fi
121− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/pagination"' >> cabal.project ; fi
122− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/testing"' >> cabal.project ; fi
123− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi
124− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi
125− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi
129+ echo "packages: servant" >> cabal.project
130+ if ! $GHCJS ; then echo "packages: servant-client" >> cabal.project ; fi
131+ echo "packages: servant-client-core" >> cabal.project
132+ if ! $GHCJS ; then echo "packages: servant-http-streams" >> cabal.project ; fi
133+ if ! $GHCJS ; then echo "packages: servant-docs" >> cabal.project ; fi
134+ if ! $GHCJS ; then echo "packages: servant-foreign" >> cabal.project ; fi
135+ if ! $GHCJS ; then echo "packages: servant-server" >> cabal.project ; fi
136+ if ! $GHCJS ; then echo "packages: doc/tutorial" >> cabal.project ; fi
137+ if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi
138+ if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi
139+ if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi
140+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi
141+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi
142+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi
143+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-postgres-pool" >> cabal.project ; fi
144+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-sqlite-simple" >> cabal.project ; fi
145+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/file-upload" >> cabal.project ; fi
146+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/generic" >> cabal.project ; fi
147+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/https" >> cabal.project ; fi
148+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/pagination" >> cabal.project ; fi
149+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/testing" >> cabal.project ; fi
150+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/structuring-apis" >> cabal.project ; fi
151+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-custom-monad" >> cabal.project ; fi
152+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-free-client" >> cabal.project ; fi
126153 - |
127− echo "constraints: foundation >=0.0.14" >> cabal.project
128− echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
129− echo "allow-newer: servant-quickcheck:servant" >> cabal.project
130− echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
131− echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
132− echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
133− echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
134− echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
135− echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
136− echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
137− echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
138− echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
139− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
140− echo "optimization: False" >> cabal.project
141− echo "write-ghc-environment-files: always" >> cabal.project
154+ echo "constraints: foundation >=0.0.14" >> cabal.project
155+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
156+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project
157+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
158+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
159+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
160+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
161+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
162+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
163+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
164+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
165+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
166+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
167+ echo "optimization: False" >> cabal.project
142168 - "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-https|cookbook-pagination|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)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
143169 - cat cabal.project || true
144170 - cat cabal.project.local || true
@@ -166,7 +192,7 @@ install:
166192 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
167193 - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
168194 - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi
169− - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
195+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
170196 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
171197 - rm cabal.project.freeze
172198script:
@@ -179,51 +205,75 @@ script:
179205 - echo 'Unpacking...' && echo -en 'travis_fold:start:unpack\\r'
180206 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
181207 - cd ${DISTDIR} || false
182− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
208+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
209+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
210+ - PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"
211+ - PKGDIR_servant_client="$(find . -maxdepth 1 -type d -regex '.*/servant-client-[0-9.]*')"
212+ - PKGDIR_servant_client_core="$(find . -maxdepth 1 -type d -regex '.*/servant-client-core-[0-9.]*')"
213+ - PKGDIR_servant_http_streams="$(find . -maxdepth 1 -type d -regex '.*/servant-http-streams-[0-9.]*')"
214+ - PKGDIR_servant_docs="$(find . -maxdepth 1 -type d -regex '.*/servant-docs-[0-9.]*')"
215+ - PKGDIR_servant_foreign="$(find . -maxdepth 1 -type d -regex '.*/servant-foreign-[0-9.]*')"
216+ - PKGDIR_servant_server="$(find . -maxdepth 1 -type d -regex '.*/servant-server-[0-9.]*')"
217+ - PKGDIR_tutorial="$(find . -maxdepth 1 -type d -regex '.*/tutorial-[0-9.]*')"
218+ - PKGDIR_servant_machines="$(find . -maxdepth 1 -type d -regex '.*/servant-machines-[0-9.]*')"
219+ - PKGDIR_servant_conduit="$(find . -maxdepth 1 -type d -regex '.*/servant-conduit-[0-9.]*')"
220+ - PKGDIR_servant_pipes="$(find . -maxdepth 1 -type d -regex '.*/servant-pipes-[0-9.]*')"
221+ - PKGDIR_cookbook_basic_auth="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-auth-[0-9.]*')"
222+ - PKGDIR_cookbook_curl_mock="$(find . -maxdepth 1 -type d -regex '.*/cookbook-curl-mock-[0-9.]*')"
223+ - PKGDIR_cookbook_basic_streaming="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-streaming-[0-9.]*')"
224+ - PKGDIR_cookbook_db_postgres_pool="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-postgres-pool-[0-9.]*')"
225+ - PKGDIR_cookbook_db_sqlite_simple="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-sqlite-simple-[0-9.]*')"
226+ - PKGDIR_cookbook_file_upload="$(find . -maxdepth 1 -type d -regex '.*/cookbook-file-upload-[0-9.]*')"
227+ - PKGDIR_cookbook_generic="$(find . -maxdepth 1 -type d -regex '.*/cookbook-generic-[0-9.]*')"
228+ - PKGDIR_cookbook_https="$(find . -maxdepth 1 -type d -regex '.*/cookbook-https-[0-9.]*')"
229+ - PKGDIR_cookbook_pagination="$(find . -maxdepth 1 -type d -regex '.*/cookbook-pagination-[0-9.]*')"
230+ - PKGDIR_cookbook_testing="$(find . -maxdepth 1 -type d -regex '.*/cookbook-testing-[0-9.]*')"
231+ - PKGDIR_cookbook_structuring_apis="$(find . -maxdepth 1 -type d -regex '.*/cookbook-structuring-apis-[0-9.]*')"
232+ - PKGDIR_cookbook_using_custom_monad="$(find . -maxdepth 1 -type d -regex '.*/cookbook-using-custom-monad-[0-9.]*')"
233+ - PKGDIR_cookbook_using_free_client="$(find . -maxdepth 1 -type d -regex '.*/cookbook-using-free-client-[0-9.]*')"
183234 # Generate cabal.project
184235 - rm -rf cabal.project cabal.project.local cabal.project.freeze
185236 - touch cabal.project
186237 - |
187− echo 'packages: "servant-*/*.cabal"' >> cabal.project
188− echo 'packages: "servant-client-*/*.cabal"' >> cabal.project
189− echo 'packages: "servant-client-core-*/*.cabal"' >> cabal.project
190− echo 'packages: "servant-http-streams-*/*.cabal"' >> cabal.project
191− echo 'packages: "servant-docs-*/*.cabal"' >> cabal.project
192− echo 'packages: "servant-foreign-*/*.cabal"' >> cabal.project
193− echo 'packages: "servant-server-*/*.cabal"' >> cabal.project
194− echo 'packages: "tutorial-*/*.cabal"' >> cabal.project
195− echo 'packages: "servant-machines-*/*.cabal"' >> cabal.project
196− echo 'packages: "servant-conduit-*/*.cabal"' >> cabal.project
197− echo 'packages: "servant-pipes-*/*.cabal"' >> cabal.project
198− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-basic-auth-*/*.cabal"' >> cabal.project ; fi
199− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-curl-mock-*/*.cabal"' >> cabal.project ; fi
200− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-basic-streaming-*/*.cabal"' >> cabal.project ; fi
201− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-db-postgres-pool-*/*.cabal"' >> cabal.project ; fi
202− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-db-sqlite-simple-*/*.cabal"' >> cabal.project ; fi
203− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-file-upload-*/*.cabal"' >> cabal.project ; fi
204− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-generic-*/*.cabal"' >> cabal.project ; fi
205− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-https-*/*.cabal"' >> cabal.project ; fi
206− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-pagination-*/*.cabal"' >> cabal.project ; fi
207− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-testing-*/*.cabal"' >> cabal.project ; fi
208− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi
209− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi
210− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi
238+ echo "packages: ${PKGDIR_servant}" >> cabal.project
239+ if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_client}" >> cabal.project ; fi
240+ echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project
241+ if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_http_streams}" >> cabal.project ; fi
242+ if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_docs}" >> cabal.project ; fi
243+ if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_foreign}" >> cabal.project ; fi
244+ if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_server}" >> cabal.project ; fi
245+ if ! $GHCJS ; then echo "packages: ${PKGDIR_tutorial}" >> cabal.project ; fi
246+ if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
247+ if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
248+ if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi
249+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi
250+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi
251+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi
252+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_postgres_pool}" >> cabal.project ; fi
253+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_sqlite_simple}" >> cabal.project ; fi
254+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_file_upload}" >> cabal.project ; fi
255+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_generic}" >> cabal.project ; fi
256+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_https}" >> cabal.project ; fi
257+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_pagination}" >> cabal.project ; fi
258+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_testing}" >> cabal.project ; fi
259+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_structuring_apis}" >> cabal.project ; fi
260+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_custom_monad}" >> cabal.project ; fi
261+ if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_free_client}" >> cabal.project ; fi
211262 - |
212− echo "constraints: foundation >=0.0.14" >> cabal.project
213− echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
214− echo "allow-newer: servant-quickcheck:servant" >> cabal.project
215− echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
216− echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
217− echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
218− echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
219− echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
220− echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
221− echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
222− echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
223− echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
224− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
225− echo "optimization: False" >> cabal.project
226− echo "write-ghc-environment-files: always" >> cabal.project
263+ echo "constraints: foundation >=0.0.14" >> cabal.project
264+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
265+ echo "allow-newer: servant-quickcheck:servant" >> cabal.project
266+ echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
267+ echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
268+ echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
269+ echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
270+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
271+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
272+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
273+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
274+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
275+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
276+ echo "optimization: False" >> cabal.project
227277 - "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-https|cookbook-pagination|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)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
228278 - cat cabal.project || true
229279 - cat cabal.project.local || true
@@ -231,13 +281,13 @@ script:
231281 # Building with tests and benchmarks...
232282 - echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'
233283 # build & run tests, build benchmarks
234− - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
284+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
235285 - echo -en 'travis_fold:end:build-everything\\r'
236286 # Testing...
237− - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
287+ - if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
238288 # haddock...
239289 - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'
240− - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
290+ - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output ; fi
241291 - echo -en 'travis_fold:end:haddock\\r'
242292
243293# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]
cabal.haskell-ci+3
@@ -2,6 +2,9 @@ folds: all-but-test
22branches: master
33jobs-selection: any
44
5+-- https://github.com/haskell/cabal/issues/6176
6+ghcjs-tools: hspec-discover
7+
58-- We have inplace packages (servant-js) so we skip installing dependencies in a separate step
69install-dependencies: False
710
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
14+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
14+tested-with: GHC==8.4.4, GHC==8.6.5
1515
1616executable cookbook-jwt-and-basic-auth
1717 main-is: JWTAndBasicAuth.lhs
doc/cookbook/open-id-connect/OpenIdConnect.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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
1212
1313executable cookbook-openidconnect
1414 main-is: OpenIdConnect.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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
13+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4.4, GHC==8.6.4
11+tested-with: GHC==8.4.4, GHC==8.6.5
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.4
19+ GHC==8.6.5
2020extra-source-files:
2121 static/index.html
2222 static/ui.js
servant-client-core/servant-client-core.cabal+2−1
@@ -20,7 +20,8 @@ tested-with:
2020 GHC ==8.0.2
2121 || ==8.2.2
2222 || ==8.4.4
23− || ==8.6.4
23+ || ==8.6.5
24+ , GHCJS == 8.4
2425
2526extra-source-files:
2627 CHANGELOG.md
servant-client/servant-client.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.4
27+ || ==8.6.5
2828
2929extra-source-files:
3030 CHANGELOG.md
servant-conduit/servant-conduit.cabal+1−1
@@ -21,7 +21,7 @@ tested-with:
2121 GHC ==8.0.2
2222 || ==8.2.2
2323 || ==8.4.4
24− || ==8.6.4
24+ || ==8.6.5
2525
2626extra-source-files:
2727 CHANGELOG.md
servant-docs/servant-docs.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.4
27+ || ==8.6.5
2828
2929extra-source-files:
3030 CHANGELOG.md
servant-foreign/servant-foreign.cabal+1−1
@@ -26,7 +26,7 @@ tested-with:
2626 GHC ==8.0.2
2727 || ==8.2.2
2828 || ==8.4.4
29− || ==8.6.4
29+ || ==8.6.5
3030
3131extra-source-files:
3232 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.4
27+ || ==8.6.5
2828
2929extra-source-files:
3030 CHANGELOG.md
servant-machines/servant-machines.cabal+1−1
@@ -21,7 +21,7 @@ tested-with:
2121 GHC ==8.0.2
2222 || ==8.2.2
2323 || ==8.4.4
24− || ==8.6.4
24+ || ==8.6.5
2525
2626extra-source-files:
2727 CHANGELOG.md
servant-pipes/servant-pipes.cabal+1−1
@@ -21,7 +21,7 @@ tested-with:
2121 GHC ==8.0.2
2222 || ==8.2.2
2323 || ==8.4.4
24− || ==8.6.4
24+ || ==8.6.5
2525
2626extra-source-files:
2727 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.4
30+ || ==8.6.5
3131
3232extra-source-files:
3333 CHANGELOG.md
servant/servant.cabal+5−1
@@ -24,7 +24,8 @@ tested-with:
2424 GHC ==8.0.2
2525 || ==8.2.2
2626 || ==8.4.4
27− || ==8.6.4
27+ || ==8.6.5
28+ , GHCJS == 8.4
2829
2930extra-source-files:
3031 CHANGELOG.md
@@ -176,6 +177,9 @@ test-suite spec
176177 hspec-discover:hspec-discover >= 2.6.0 && < 2.8
177178
178179test-suite doctests
180+ if impl(ghcjs)
181+ buildable: False
182+
179183 build-depends:
180184 base
181185 , servant