From b45e94de19fb76155fa873c1297127f37a5e5339 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 22 Oct 2017 12:59:10 +0300 Subject: [PATCH 1/3] cabal new-build based .travis.yml --- .travis.yml | 153 ++++++++++++++---- cabal.project | 3 +- servant-client-core/servant-client-core.cabal | 6 + servant-client/servant-client.cabal | 6 +- servant-docs/servant-docs.cabal | 6 +- servant-foreign/servant-foreign.cabal | 6 + servant-server/servant-server.cabal | 6 +- servant/servant.cabal | 6 +- 8 files changed, 159 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ee29bef..c1e3a823 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,131 @@ -sudo: false -dist: trusty - +# This Travis job script has been generated by a script via +# +# make_travis_yml_2.hs '-f' '-o' '.travis.yml' 'cabal.project' +# +# For more information, see https://github.com/hvr/multi-ghc-travis +# language: c +sudo: false -env: - - STACK_YAML=stack-ghc-7.8.4.yaml - - STACK_YAML=stack-ghc-7.10.3.yaml - - STACK_YAML=stack.yaml - - STACK_YAML=stack-ghc-8.2.1.yaml - -addons: - apt: - packages: - - libgmp-dev - -install: - - mkdir -p ~/.local/bin - - export PATH=$HOME/.local/bin:$PATH - - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' - - stack --version - - stack setup --no-terminal - - (cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc) - -script: - - if [ "$STACK_YAML" = "stack-ghc-8.2.1.yaml" ]; then HOMEMODULES="--ghc-options=-Wno-missing-home-modules"; fi - - if [ "$TRAVIS_EVENT_TYPE" = "cron" ] ; then ./scripts/ci-cron.sh ; else stack test $HOMEMODULES --ghc-options=-Werror --no-terminal ; fi +git: + submodules: false # whether to recursively clone submodules cache: directories: - - $HOME/.tinc/cache - - $HOME/.stack + - $HOME/.cabal/packages + - $HOME/.cabal/store + +before_cache: + - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log + # remove files that are regenerated by 'cabal update' + - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.* + - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json + - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache + - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar + - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx + +matrix: + include: + - compiler: "ghc-7.8.4" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}} + - compiler: "ghc-7.10.3" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}} + - 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" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}} + +before_install: + - HC=${CC} + - HCPKG=${HC/ghc/ghc-pkg} + - unset CC + - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH + +install: + - cabal --version + - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" + - BENCH=${BENCH---enable-benchmarks} + - TEST=${TEST---enable-tests} + - HADDOCK=${HADDOCK-true} + - INSTALLED=${INSTALLED-true} + - travis_retry cabal update -v + - sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config + - rm -fv cabal.project.local + - if [ -f "servant/configure.ac" ]; then + (cd "servant"; autoreconf -i); + fi + - if [ -f "servant-client/configure.ac" ]; then + (cd "servant-client"; autoreconf -i); + fi + - if [ -f "servant-client-core/configure.ac" ]; then + (cd "servant-client-core"; autoreconf -i); + fi + - if [ -f "servant-docs/configure.ac" ]; then + (cd "servant-docs"; autoreconf -i); + fi + - if [ -f "servant-foreign/configure.ac" ]; then + (cd "servant-foreign"; autoreconf -i); + fi + - if [ -f "servant-server/configure.ac" ]; then + (cd "servant-server"; autoreconf -i); + fi + - if [ -f "doc/tutorial/configure.ac" ]; then + (cd "doc/tutorial"; autoreconf -i); + fi + - rm -f cabal.project.freeze + - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all + - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all + - rm -rf "servant"/.ghc.environment.* "servant-client"/.ghc.environment.* "servant-client-core"/.ghc.environment.* "servant-docs"/.ghc.environment.* "servant-foreign"/.ghc.environment.* "servant-server"/.ghc.environment.* "doc/tutorial"/.ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist + - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) + +# Here starts the actual work to be performed for the package under test; +# any command which exits with a non-zero exit code causes the build to fail. +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) + - 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} + - 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" + - 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) + - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all + - echo -en 'travis_fold:end:build\\r' + + - 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 + - echo -en 'travis_fold:end:build-installed\\r' + + - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r' + # build & run tests, build benchmarks + - cabal new-build -w ${HC} ${TEST} ${BENCH} all + - echo -en 'travis_fold:end:build-everything\\r' + - echo Testing... && echo -en 'travis_fold:start:test\\r' + - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi + - echo -en 'travis_fold:end:test\\r' + + - echo Haddock... && echo -en 'travis_fold:start:haddock\\r' + # haddock + - rm -rf ./dist-newstyle + - 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"] +# EOF diff --git a/cabal.project b/cabal.project index dc1dc1e5..9c65df10 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,4 @@ -packages: - servant/ +packages: servant/ servant-client/ servant-client-core/ servant-docs/ diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 71064142..a3baf880 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -18,6 +18,12 @@ extra-source-files: include/*.h CHANGELOG.md README.md +tested-with: + GHC==7.8.4 + GHC==7.10.3 + GHC==8.0.2 + GHC==8.2.1 + source-repository head type: git location: http://github.com/haskell-servant/servant.git diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index f9c0fe08..e2d9d385 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -16,7 +16,11 @@ copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2017 Servant category: Servant, Web build-type: Simple cabal-version: >=1.10 -tested-with: GHC >= 7.8 +tested-with: + GHC==7.8.4 + GHC==7.10.3 + GHC==8.0.2 + GHC==8.2.1 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 e2ea0a4e..38d3d6c9 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -15,7 +15,11 @@ copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contribut category: Servant, Web build-type: Simple cabal-version: >=1.10 -tested-with: GHC >= 7.8 +tested-with: + GHC==7.8.4 + GHC==7.10.3 + GHC==8.0.2 + GHC==8.2.1 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 32839565..25b72cd2 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -22,6 +22,12 @@ extra-source-files: CHANGELOG.md README.md bug-reports: http://github.com/haskell-servant/servant/issues +tested-with: + GHC==7.8.4 + GHC==7.10.3 + GHC==8.0.2 + GHC==8.2.1 + source-repository head type: git location: http://github.com/haskell-servant/servant.git diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 6bd91476..6e1f5ccf 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -21,7 +21,11 @@ copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contribut category: Servant, Web build-type: Custom cabal-version: >=1.10 -tested-with: GHC >= 7.8 +tested-with: + GHC==7.8.4 + GHC==7.10.3 + GHC==8.0.2 + GHC==8.2.1 extra-source-files: include/*.h CHANGELOG.md diff --git a/servant/servant.cabal b/servant/servant.cabal index 3b34c2d0..26ab1181 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -17,7 +17,11 @@ copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contribut category: Servant, Web build-type: Custom cabal-version: >=1.10 -tested-with: GHC >= 7.8 +tested-with: + GHC==7.8.4 + GHC==7.10.3 + GHC==8.0.2 + GHC==8.2.1 extra-source-files: include/*.h CHANGELOG.md From fcaef360cbf970a6a609d5d2328b968096c3d2bd Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 22 Oct 2017 13:09:07 +0300 Subject: [PATCH 2/3] Don't build --dep for all As tutorial depends on servant-js, which isn't in this repository cabal fails fatally to `new-build --dep all`. Instead we are building deps for servant-server and servant-client only, which already includes e.g. http-client and warp, i.e. pretty much everything we need. It's not bad that some dependencies might be build during `script` phase --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1e3a823..03f09fe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,8 +77,8 @@ install: (cd "doc/tutorial"; autoreconf -i); fi - rm -f cabal.project.freeze - - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all - - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all + - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 servant-server servant-client + - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 servant-server servant-client - rm -rf "servant"/.ghc.environment.* "servant-client"/.ghc.environment.* "servant-client-core"/.ghc.environment.* "servant-docs"/.ghc.environment.* "servant-foreign"/.ghc.environment.* "servant-server"/.ghc.environment.* "doc/tutorial"/.ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) From 9fa886b145d04b48c25446df37a8f0f52286a96a Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 22 Oct 2017 14:13:18 +0300 Subject: [PATCH 3/3] Improve .cabal files - Add build-tool-depends, so new-build can use hspec-discover - Add mtl bounds in tutorial (and dependency on mtl-compact) - Add extra-source-files to tutorial, so it's buildable from sdist