diff --git a/.travis.yml b/.travis.yml index 8eb2bca1..d251fb3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,25 +33,23 @@ before_cache: matrix: include: - compiler: "ghc-8.6.3" - # env: FOO=bar addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}} - compiler: "ghc-8.4.4" - # env: FOO=bar addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}} - compiler: "ghc-8.2.2" - # env: FOO=bar addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}} - compiler: "ghc-8.0.2" - # env: FOO=bar addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}} before_install: - HC=/opt/ghc/bin/${CC} + - HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//') + - echo $HCVER - HCPKG=${HC/ghc/ghc-pkg} - unset CC - CABAL=/opt/ghc/bin/cabal - CABALHOME=$HOME/.cabal - - "export PATH=\"$CABALHOME/bin:$PATH\"" + - export PATH="$CABALHOME/bin:$PATH" - ROOTDIR=$(pwd) - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - echo $HCNUMVER @@ -63,7 +61,7 @@ install: - BENCH=--enable-benchmarks - GHCHEAD=${GHCHEAD-false} - travis_retry ${CABAL} update -v - - "sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config" + - sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config - rm -fv cabal.project cabal.project.local - "sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' $CABALHOME/config" - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$' @@ -88,32 +86,22 @@ install: - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/file-upload\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/generic\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/https\"\\n' >> cabal.project ; fi" + - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/pagination\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/testing\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/structuring-apis\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/using-custom-monad\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/using-free-client\"\\n' >> cabal.project ; fi" - "echo 'constraints: foundation >=0.0.14' >> cabal.project" - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project" - - "echo 'allow-newer: servant-js:base' >> cabal.project" - - "echo 'allow-newer: servant-pagination:servant' >> cabal.project" - - "echo 'allow-newer: servant-pagination:servant-server' >> cabal.project" - - "echo 'allow-newer: servant-multipart:servant' >> cabal.project" - - "echo 'allow-newer: servant-multipart:servant-server' >> cabal.project" - - "echo 'allow-newer: servant-auth-server:servant' >> cabal.project" - - "echo 'allow-newer: servant-auth-server:servant-server' >> cabal.project" - - "echo 'allow-newer: servant-auth-server:http-api-data' >> cabal.project" - - "echo 'allow-newer: servant-js:servant' >> cabal.project" - - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:hspec' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project" - - "echo 'reorder-goals: True' >> cabal.project" - "echo 'optimization: False' >> cabal.project " - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - touch cabal.project.local - - "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-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" + - "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)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi @@ -135,22 +123,23 @@ install: - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi - if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi - if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi + - if [ -f "doc/cookbook/pagination/configure.ac" ]; then (cd "doc/cookbook/pagination" && autoreconf -i); fi - if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi - rm -f cabal.project.freeze - - 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/https"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist + - 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/https"/dist "doc/cookbook/pagination"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/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'" + - echo Packaging... && echo -en 'travis_fold:start:sdist\\r' - ${CABAL} new-sdist all - - "echo -en 'travis_fold:end:sdist\\\\r'" - - "echo Unpacking... && echo -en 'travis_fold:start:unpack\\\\r'" + - echo -en 'travis_fold:end:sdist\\r' + - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r' - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; @@ -175,46 +164,36 @@ script: - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-file-upload-*/*.cabal\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-generic-*/*.cabal\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-https-*/*.cabal\"\\n' >> cabal.project ; fi" + - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-pagination-*/*.cabal\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-testing-*/*.cabal\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-structuring-apis-*/*.cabal\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-using-custom-monad-*/*.cabal\"\\n' >> cabal.project ; fi" - "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-using-free-client-*/*.cabal\"\\n' >> cabal.project ; fi" - "echo 'constraints: foundation >=0.0.14' >> cabal.project" - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project" - - "echo 'allow-newer: servant-js:base' >> cabal.project" - - "echo 'allow-newer: servant-pagination:servant' >> cabal.project" - - "echo 'allow-newer: servant-pagination:servant-server' >> cabal.project" - - "echo 'allow-newer: servant-multipart:servant' >> cabal.project" - - "echo 'allow-newer: servant-multipart:servant-server' >> cabal.project" - - "echo 'allow-newer: servant-auth-server:servant' >> cabal.project" - - "echo 'allow-newer: servant-auth-server:servant-server' >> cabal.project" - - "echo 'allow-newer: servant-auth-server:http-api-data' >> cabal.project" - - "echo 'allow-newer: servant-js:servant' >> cabal.project" - - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:hspec' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project" - - "echo 'reorder-goals: True' >> cabal.project" - "echo 'optimization: False' >> cabal.project " - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - touch cabal.project.local - - "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-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" + - "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)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true - - "echo -en 'travis_fold:end:unpack\\\\r'" + - echo -en 'travis_fold:end:unpack\\r' - - "echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\\\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 -en 'travis_fold:end:build-everything\\r' - if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi - - "echo Haddock... && echo -en 'travis_fold:start:haddock\\\\r'" + - echo Haddock... && echo -en 'travis_fold:start:haddock\\r' # haddock - ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all - - "echo -en 'travis_fold:end:haddock\\\\r'" + - echo -en 'travis_fold:end:haddock\\r' # REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"] # EOF diff --git a/cabal.project b/cabal.project index fd2355e0..7c88a106 100644 --- a/cabal.project +++ b/cabal.project @@ -24,7 +24,7 @@ packages: -- doc/cookbook/hoist-server-with-context doc/cookbook/https -- doc/cookbook/jwt-and-basic-auth/ - -- doc/cookbook/pagination + doc/cookbook/pagination -- doc/cookbook/sentry doc/cookbook/testing doc/cookbook/structuring-apis @@ -33,10 +33,7 @@ packages: tests: True optimization: False -reorder-goals: True - -allow-newer: - servant-js:base +-- reorder-goals: True constraints: -- see https://github.com/haskell-infra/hackage-trustees/issues/119 @@ -44,10 +41,10 @@ constraints: memory <0.14.12 || >0.14.12 allow-newer: - servant-pagination:servant, servant-pagination:servant-server, - servant-multipart:servant, servant-multipart:servant-server, - servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data, - servant-js:servant, servant-js:servant-foreign +-- servant-pagination:servant, servant-pagination:servant-server, +-- servant-multipart:servant, servant-multipart:servant-server, +-- servant-auth-server:servant, servant-auth-server:servant-server, +-- servant-js:servant, servant-js:servant-foreign -- servant-quickcheck allow-newer: