From ccf0056f6425bded053b83605a367500dca37369 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 10 Dec 2017 13:29:37 +0200 Subject: [PATCH] Regenerate .travis.yml --- .travis.yml | 42 ++++++++----------- doc/tutorial/tutorial.cabal | 2 +- servant-client-core/servant-client-core.cabal | 2 +- servant-client/servant-client.cabal | 2 +- servant-docs/servant-docs.cabal | 2 +- servant-foreign/servant-foreign.cabal | 2 +- servant-server/servant-server.cabal | 2 +- servant/servant.cabal | 2 +- 8 files changed, 25 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index d58bba3f..acc5bdf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ # This Travis job script has been generated by a script via # -# make_travis_yml_2.hs '-f' '-o' '.travis.yml' 'cabal.project' +# make_travis_yml_2.hs '-f' '-o' '.travis.yml' '--branch' 'master' '--branch' 'release-0.12' 'cabal.project' # # For more information, see https://github.com/hvr/multi-ghc-travis # @@ -12,8 +12,8 @@ git: branches: only: - - master - release-0.12 + - master cache: directories: @@ -40,15 +40,16 @@ matrix: - compiler: "ghc-8.0.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}} - - compiler: "ghc-8.2.1" + - compiler: "ghc-8.2.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}} before_install: - HC=${CC} - HCPKG=${HC/ghc/ghc-pkg} - unset CC - - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH + - ROOTDIR=$(pwd) + - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH" install: - cabal --version @@ -58,7 +59,7 @@ install: - HADDOCK=${HADDOCK-true} - INSTALLED=${INSTALLED-true} - travis_retry cabal update -v - - sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config + - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config" - rm -fv cabal.project.local - if [ -f "servant/configure.ac" ]; then (cd "servant"; autoreconf -i); @@ -92,26 +93,21 @@ install: script: # test that source-distributions can be generated - echo Packaging... && echo -en 'travis_fold:start:sdist\\r' - - (cd "servant"; cabal sdist) - - (cd "servant-client"; cabal sdist) - - (cd "servant-client-core"; cabal sdist) - - (cd "servant-docs"; cabal sdist) - - (cd "servant-foreign"; cabal sdist) - - (cd "servant-server"; cabal sdist) - - (cd "doc/tutorial"; cabal sdist) + - (cd "servant" && cabal sdist) + - (cd "servant-client" && cabal sdist) + - (cd "servant-client-core" && cabal sdist) + - (cd "servant-docs" && cabal sdist) + - (cd "servant-foreign" && cabal sdist) + - (cd "servant-server" && cabal sdist) + - (cd "doc/tutorial" && cabal sdist) - echo -en 'travis_fold:end:sdist\\r' - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r' - 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 ${DISTDIR}/ - - cd ${DISTDIR} + - cd ${DISTDIR} || false - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal\n' > cabal.project" - + - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal\\n' > cabal.project" # Allow-newer and other cabal.project amendments - "echo 'allow-newer: servant-js:servant, servant-js:servant-foreign' >> cabal.project" - - # cryptonite - - "echo 'constraints: foundation >=0.0.14' >> cabal.project" - - echo -en 'travis_fold:end:unpack\\r' - echo Building... && echo -en 'travis_fold:start:build\\r' # this builds all libraries and executables (without tests/benchmarks) @@ -120,9 +116,7 @@ script: - echo Building with installed constraints for package in global-db... && echo -en 'travis_fold:start:build-installed\\r' # Build with installed constraints for packages in global-db - - if $INSTALLED; then - echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; - else echo "Not building with installed constraints"; fi + - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi - echo -en 'travis_fold:end:build-installed\\r' - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r' @@ -139,5 +133,5 @@ script: - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi - echo -en 'travis_fold:end:haddock\\r' -# REGENDATA ["-f","-o",".travis.yml","cabal.project"] +# REGENDATA ["-f","-o",".travis.yml","--branch","master","--branch","release-0.12","cabal.project"] # EOF diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal index 975a5c7c..6bc6c45e 100644 --- a/doc/tutorial/tutorial.cabal +++ b/doc/tutorial/tutorial.cabal @@ -12,7 +12,7 @@ tested-with: GHC==7.8.4 GHC==7.10.3 GHC==8.0.2 - GHC==8.2.1 + GHC==8.2.2 extra-source-files: static/index.html static/ui.js diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 8be5e2d4..f2f643da 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -22,7 +22,7 @@ tested-with: GHC==7.8.4 GHC==7.10.3 GHC==8.0.2 - GHC==8.2.1 + GHC==8.2.2 source-repository head type: git diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index d4534510..89ab1ab9 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -20,7 +20,7 @@ tested-with: GHC==7.8.4 GHC==7.10.3 GHC==8.0.2 - GHC==8.2.1 + GHC==8.2.2 homepage: http://haskell-servant.readthedocs.org/ Bug-reports: http://github.com/haskell-servant/servant/issues extra-source-files: diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index 5bf77209..7b3e30f5 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -19,7 +19,7 @@ tested-with: GHC==7.8.4 GHC==7.10.3 GHC==8.0.2 - GHC==8.2.1 + GHC==8.2.2 homepage: http://haskell-servant.readthedocs.org/ Bug-reports: http://github.com/haskell-servant/servant/issues extra-source-files: diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index d7267697..3e5f6e85 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -26,7 +26,7 @@ tested-with: GHC==7.8.4 GHC==7.10.3 GHC==8.0.2 - GHC==8.2.1 + GHC==8.2.2 source-repository head type: git diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index abe40b0e..6aa5ac22 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -25,7 +25,7 @@ tested-with: GHC==7.8.4 GHC==7.10.3 GHC==8.0.2 - GHC==8.2.1 + GHC==8.2.2 extra-source-files: include/*.h CHANGELOG.md diff --git a/servant/servant.cabal b/servant/servant.cabal index 80900644..15ea3e80 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -21,7 +21,7 @@ tested-with: GHC==7.8.4 GHC==7.10.3 GHC==8.0.2 - GHC==8.2.1 + GHC==8.2.2 extra-source-files: include/*.h CHANGELOG.md