d9e653c · servant · git.iko.soy

git.iko.soy/servant

Merge pull request #1250 from haskell-servant/travis-update-2019-12-09

Try to fix CI: remove servant-jssaddle, install npm

commitd9e653cdc1adf0c211dc1aba57f8d53aa333e518 authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 9 Dec 2019, 23:12 (7 years ago) parent971d140 ce5939b

2 files changed+16−13

compare with master

unifiedsplit

.travis.yml+14−11 cabal.project+2−2

.travis.yml+14−11

@@ -4,9 +4,11 @@

44#

55# For more information, see https://github.com/haskell-CI/haskell-ci

66#

7−# version: 0.7.20191106

7+# version: 0.9.20191209

88#

9+version: ~> 1.0

910language: c

11+os: linux

1012dist: bionic

1113git:

1214 # whether to recursively clone submodules

@@ -30,20 +32,26 @@ before_cache:

3032 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

3133 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

3234 - rm -rfv $CABALHOME/packages/head.hackage

33−matrix:

35+jobs:

3436 include:

3537 - compiler: ghcjs-8.4

36− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"},{"sourceline":"deb http://ppa.launchpad.net/hvr/ghcjs/ubuntu bionic main"}],"packages":["ghcjs-8.4","cabal-install-3.0","ghc-8.4.4","nodejs"]}}

38+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"},{"sourceline":"deb http://ppa.launchpad.net/hvr/ghcjs/ubuntu bionic main"},{"sourceline":"deb https://deb.nodesource.com/node_10.x bionic main","key_url":"https://deb.nodesource.com/gpgkey/nodesource.gpg.key"}],"packages":["ghcjs-8.4","cabal-install-3.0","ghc-8.4.4","nodejs"]}}

39+ os: linux

3740 - compiler: ghc-8.8.1

3841 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}

42+ os: linux

3943 - compiler: ghc-8.6.5

4044 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}

45+ os: linux

4146 - compiler: ghc-8.4.4

4247 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}

48+ os: linux

4349 - compiler: ghc-8.2.2

4450 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}

51+ os: linux

4552 - compiler: ghc-8.0.2

4653 addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}

54+ os: linux

4755before_install:

4856 - |

4957 if echo $CC | grep -q ghcjs; then

@@ -142,7 +150,6 @@ install:

142150 if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi

143151 if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi

144152 if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi

145− echo "packages: servant-jsaddle" >> cabal.project

146153 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi

147154 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi

148155 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi

@@ -180,7 +187,7 @@ install:

180187 echo "allow-newer: jsaddle-dom-0.9.3.2:lens" >> cabal.project

181188 echo "allow-newer: jsaddle-warp-0.9.6.0:time" >> cabal.project

182189 echo "optimization: False" >> cabal.project

183− - "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-file-upload|cookbook-generic|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-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

190+ - "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-file-upload|cookbook-generic|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"

184191 - cat cabal.project || true

185192 - cat cabal.project.local || true

186193 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi

@@ -194,7 +201,6 @@ install:

194201 - if [ -f "servant-machines/configure.ac" ]; then (cd "servant-machines" && autoreconf -i); fi

195202 - if [ -f "servant-conduit/configure.ac" ]; then (cd "servant-conduit" && autoreconf -i); fi

196203 - if [ -f "servant-pipes/configure.ac" ]; then (cd "servant-pipes" && autoreconf -i); fi

197− - if [ -f "servant-jsaddle/configure.ac" ]; then (cd "servant-jsaddle" && autoreconf -i); fi

198204 - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then (cd "doc/cookbook/basic-auth" && autoreconf -i); fi

199205 - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi

200206 - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi

@@ -232,7 +238,6 @@ script:

232238 - PKGDIR_servant_machines="$(find . -maxdepth 1 -type d -regex '.*/servant-machines-[0-9.]*')"

233239 - PKGDIR_servant_conduit="$(find . -maxdepth 1 -type d -regex '.*/servant-conduit-[0-9.]*')"

234240 - PKGDIR_servant_pipes="$(find . -maxdepth 1 -type d -regex '.*/servant-pipes-[0-9.]*')"

235− - PKGDIR_servant_jsaddle="$(find . -maxdepth 1 -type d -regex '.*/servant-jsaddle-[0-9.]*')"

236241 - PKGDIR_cookbook_basic_auth="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-auth-[0-9.]*')"

237242 - PKGDIR_cookbook_curl_mock="$(find . -maxdepth 1 -type d -regex '.*/cookbook-curl-mock-[0-9.]*')"

238243 - PKGDIR_cookbook_basic_streaming="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-streaming-[0-9.]*')"

@@ -259,7 +264,6 @@ script:

259264 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi

260265 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi

261266 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi

262− echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project

263267 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi

264268 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi

265269 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi

@@ -297,7 +301,7 @@ script:

297301 echo "allow-newer: jsaddle-dom-0.9.3.2:lens" >> cabal.project

298302 echo "allow-newer: jsaddle-warp-0.9.6.0:time" >> cabal.project

299303 echo "optimization: False" >> cabal.project

300− - "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-file-upload|cookbook-generic|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-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

304+ - "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-file-upload|cookbook-generic|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"

301305 - cat cabal.project || true

302306 - cat cabal.project.local || true

303307 - |

@@ -314,7 +318,6 @@ script:

314318 servant-machines) echo ${PKGDIR_servant_machines} ;;

315319 servant-conduit) echo ${PKGDIR_servant_conduit} ;;

316320 servant-pipes) echo ${PKGDIR_servant_pipes} ;;

317− servant-jsaddle) echo ${PKGDIR_servant_jsaddle} ;;

318321 cookbook-basic-auth) echo ${PKGDIR_cookbook_basic_auth} ;;

319322 cookbook-curl-mock) echo ${PKGDIR_cookbook_curl_mock} ;;

320323 cookbook-basic-streaming) echo ${PKGDIR_cookbook_basic_streaming} ;;

@@ -342,5 +345,5 @@ script:

342345 - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output ; fi

343346 - echo -en 'travis_fold:end:haddock\\r'

344347

345−# REGENDATA ("0.7.20191106",["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"])

348+# REGENDATA ("0.9.20191209",["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"])

346349# EOF

cabal.project+2−2

@@ -15,8 +15,8 @@ packages:

1515 servant-pipes/

1616

1717-- servant GHCJS

18−packages:

19− servant-jsaddle/

18+-- packages:

19+-- servant-jsaddle/

2020

2121-- Cookbooks

2222packages: