From 0e191964ae5a44ccd28e0a9b3b5f754e9ce97bda Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 11 Feb 2019 15:52:42 +0200 Subject: [PATCH] Add optimization: False --- .travis.yml | 28 ++++++++++++++++------- cabal.make-travis-yml => cabal.haskell-ci | 0 cabal.project | 3 ++- 3 files changed, 22 insertions(+), 9 deletions(-) rename cabal.make-travis-yml => cabal.haskell-ci (100%) diff --git a/.travis.yml b/.travis.yml index e3f30a2b..966666d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,10 @@ # This Travis job script has been generated by a script via # -# runghc make_travis_yml_2.hs '--config=cabal.make-travis-yml' '--output=.travis.yml' 'cabal.project' +# haskell-ci '--config=cabal.haskell-ci' '--output=.travis.yml' 'cabal.project' # # For more information, see https://github.com/haskell-CI/haskell-ci # language: c -sudo: false - dist: xenial git: @@ -73,8 +71,15 @@ install: - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$' - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-http-streams\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"servant-machines\" \"servant-conduit\" \"servant-pipes\" \"doc/cookbook/basic-auth\" \"doc/cookbook/curl-mock\" \"doc/cookbook/basic-streaming\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/hoist-server-with-context\" \"doc/cookbook/https\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/testing\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/using-free-client\"\\n' > cabal.project" - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project" - - "echo 'allow-newer: servant-js:base, servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-quickcheck:hspec,servant-quickcheck:http-client' >> cabal.project" + - "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-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 'optimization: False' >> cabal.project " - touch cabal.project.local - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-http-streams | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi" - cat cabal.project || true @@ -171,8 +176,15 @@ script: - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-http-streams-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal servant-machines-*/*.cabal servant-conduit-*/*.cabal servant-pipes-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-curl-mock-*/*.cabal cookbook-basic-streaming-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-hoist-server-with-context-*/*.cabal cookbook-https-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-testing-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-using-free-client-*/*.cabal\\n' > cabal.project" - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project" - - "echo 'allow-newer: servant-js:base, servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-quickcheck:hspec,servant-quickcheck:http-client' >> cabal.project" + - "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-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 'optimization: False' >> cabal.project " - touch cabal.project.local - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-http-streams | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi" - cat cabal.project || true @@ -190,5 +202,5 @@ script: - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi - echo -en 'travis_fold:end:haddock\\r' -# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","cabal.project"] +# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"] # EOF diff --git a/cabal.make-travis-yml b/cabal.haskell-ci similarity index 100% rename from cabal.make-travis-yml rename to cabal.haskell-ci diff --git a/cabal.project b/cabal.project index 6052321d..2422b6f3 100644 --- a/cabal.project +++ b/cabal.project @@ -31,7 +31,8 @@ packages: doc/cookbook/using-custom-monad doc/cookbook/using-free-client -tests: true +tests: True +optimization: False allow-newer: servant-js:base