From dd2d952008cd040d9176ac804a713cce41d928f9 Mon Sep 17 00:00:00 2001 From: Julien Tanguy Date: Wed, 8 Jul 2015 19:39:38 +0200 Subject: Fix travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ebc8207..4e005c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,21 +16,21 @@ before_install: - travis_retry sudo add-apt-repository -y ppa:hvr/ghc - travis_retry sudo apt-get update - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER - - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH + - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:~/.cabal/bin:$PATH install: - cabal --version - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - travis_retry cabal update - cabal install hpc-coveralls - - cabal install --only-dependencies --enable-tests --enable-benchmarks --enable-coverage + - cabal install --only-dependencies --enable-tests --enable-benchmarks # 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: # -v2 provides useful information for debugging - - cabal configure --enable-tests --enable-benchmarks -v2 + - cabal configure --enable-tests --enable-benchmarks --enable-coverage -v2 # this builds all libraries and executables # (including tests/benchmarks) -- cgit v1.2.3 From cf070d576aea4962a4237d1bc7bf58ebbc472b83 Mon Sep 17 00:00:00 2001 From: Julien Tanguy Date: Mon, 17 Aug 2015 15:00:18 +0200 Subject: Update travis.yml to use the new infrastructure --- .travis.yml | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e005c8..ebe68b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,34 +3,42 @@ language: c # See also https://github.com/hvr/multi-ghc-travis for more information +# explicitly request container-based infrastructure +sudo: false + # The following lines enable several GHC versions and/or HP versions # to be tested; often it's enough to test only against the last # release of a major GHC version. Setting HPVER implictly sets # GHCVER. Omit lines with versions you don't need/want testing for. -env: - - CABALVER=1.22 GHCVER=7.10.1 +matrix: + include: + - env: CABALVER=1.18 GHCVER=7.8.4 + addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}} + - env: CABALVER=1.22 GHCVER=7.10.1 + addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}} + - env: CABALVER=head GHCVER=head + addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}} + + allow_failures: + - env: CABALVER=head GHCVER=head -# Note: the distinction between `before_install` and `install` is not -# important. before_install: - - travis_retry sudo add-apt-repository -y ppa:hvr/ghc - - travis_retry sudo apt-get update - - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER - - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:~/.cabal/bin:$PATH + - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH install: - cabal --version - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - travis_retry cabal update + - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config # The container environment reports 16 cores - cabal install hpc-coveralls - - cabal install --only-dependencies --enable-tests --enable-benchmarks + - cabal install --only-dependencies # 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: # -v2 provides useful information for debugging - - cabal configure --enable-tests --enable-benchmarks --enable-coverage -v2 + - cabal configure --enable-tests --enable-benchmarks --enable-coverage -v2 # this builds all libraries and executables # (including tests/benchmarks) @@ -46,6 +54,6 @@ script: - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && (cd dist && cabal install --force-reinstalls "$SRC_TGZ") -after_script: +after_script: - hpc-coveralls test # EOF -- cgit v1.2.3 From 6c1c52e9f52c9e402f5c7b11565f1b1ad8dd586f Mon Sep 17 00:00:00 2001 From: Julien Tanguy Date: Mon, 17 Aug 2015 15:43:40 +0200 Subject: Fix travix.yml --- .travis.yml | 52 ++++++++++++++++++++-------------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index ebe68b4..73c37d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ -# NB: don't set `language: haskell` here language: c -# See also https://github.com/hvr/multi-ghc-travis for more information - -# explicitly request container-based infrastructure sudo: false # The following lines enable several GHC versions and/or HP versions @@ -12,12 +8,12 @@ sudo: false # GHCVER. Omit lines with versions you don't need/want testing for. matrix: include: - - env: CABALVER=1.18 GHCVER=7.8.4 - addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}} - - env: CABALVER=1.22 GHCVER=7.10.1 - addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}} - - env: CABALVER=head GHCVER=head - addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}} + - env: CABALVER=1.18 GHCVER=7.8.4 + addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}} + - env: CABALVER=1.22 GHCVER=7.10.1 + addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}} + - env: CABALVER=head GHCVER=head + addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}} allow_failures: - env: CABALVER=head GHCVER=head @@ -26,34 +22,26 @@ before_install: - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH install: - - cabal --version - - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - - travis_retry cabal update - - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config # The container environment reports 16 cores - - cabal install hpc-coveralls - - cabal install --only-dependencies - -# 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. + - cabal --version + - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" + - travis_retry cabal update + - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config # The container environment reports 16 cores + - cabal install hpc-coveralls + - cabal install --only-dependencies + script: - # -v2 provides useful information for debugging - cabal configure --enable-tests --enable-benchmarks --enable-coverage -v2 + - cabal build - # this builds all libraries and executables - # (including tests/benchmarks) - - cabal build + - run-cabal-test --show-details=streaming - - run-cabal-test --show-details=streaming - - cabal check + - cabal check - # tests that a source-distribution can be generated - - cabal sdist + - cabal sdist - # check that the generated source-distribution can be built & installed - - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && - (cd dist && cabal install --force-reinstalls "$SRC_TGZ") + - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && + (cd dist && cabal install --force-reinstalls "$SRC_TGZ") after_script: - - hpc-coveralls test +- hpc-coveralls test # EOF -- cgit v1.2.3 From d6efc27d244fa9327a2fa3fa8fe8d4010511d6eb Mon Sep 17 00:00:00 2001 From: Julien Tanguy Date: Mon, 17 Aug 2015 16:19:59 +0200 Subject: Remove hpc-coveralls for now --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 73c37d8..516f653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,14 +26,13 @@ install: - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - travis_retry cabal update - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config # The container environment reports 16 cores - - cabal install hpc-coveralls - cabal install --only-dependencies script: - - cabal configure --enable-tests --enable-benchmarks --enable-coverage -v2 + - cabal configure --enable-tests --enable-benchmarks -v2 - cabal build - - run-cabal-test --show-details=streaming + - cabal test --show-details=streaming - cabal check @@ -42,6 +41,4 @@ script: - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && (cd dist && cabal install --force-reinstalls "$SRC_TGZ") -after_script: -- hpc-coveralls test # EOF -- cgit v1.2.3 From e82b552f09763f0f21bbbf6dcf71936211b16e1a Mon Sep 17 00:00:00 2001 From: Julien Tanguy Date: Mon, 17 Aug 2015 16:28:07 +0200 Subject: Forgot to enable tests and benchs in dep install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 516f653..81c5f5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ install: - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - travis_retry cabal update - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config # The container environment reports 16 cores - - cabal install --only-dependencies + - cabal install --only-dependencies --enable-tests --enable-benchmarks script: - cabal configure --enable-tests --enable-benchmarks -v2 -- cgit v1.2.3 From 8872c6ad5cc057023b94f4c2561801849159afa1 Mon Sep 17 00:00:00 2001 From: Julien Tanguy Date: Mon, 17 Aug 2015 16:53:33 +0200 Subject: Handle different flags for 'cabal test' Cabal 1.18 does not handle --show-details=streaming --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81c5f5c..618741d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +# See also https://github.com/hvr/multi-ghc-travis for more information language: c sudo: false @@ -8,11 +9,11 @@ sudo: false # GHCVER. Omit lines with versions you don't need/want testing for. matrix: include: - - env: CABALVER=1.18 GHCVER=7.8.4 + - env: CABALVER=1.18 GHCVER=7.8.4 CTOPTS="" addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}} - - env: CABALVER=1.22 GHCVER=7.10.1 + - env: CABALVER=1.22 GHCVER=7.10.1 CTOPTS="--show-details=streaming" addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}} - - env: CABALVER=head GHCVER=head + - env: CABALVER=head GHCVER=head CTOPTS="--show-details=streaming" addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}} allow_failures: @@ -32,7 +33,7 @@ script: - cabal configure --enable-tests --enable-benchmarks -v2 - cabal build - - cabal test --show-details=streaming + - cabal test $CTOPTS - cabal check -- cgit v1.2.3