aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Theriault <alec.theriault@gmail.com>2018-09-22 11:42:54 -0700
committerAlec Theriault <alec.theriault@gmail.com>2018-09-22 13:07:35 -0700
commit7873f4c1011c5ab61ab050399a129d48b54b3491 (patch)
tree4b0b248116c002f76a93bc62d305546d9afc96de
parent246905efb043ca1aec041defe77b2cfa2cbcda92 (diff)
keep cabal.project file
-rw-r--r--.travis.yml13
1 files changed, 2 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index cc75b682..681399b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,9 +53,8 @@ install:
- GHCHEAD=${GHCHEAD-false}
- travis_retry cabal update -v
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
- - rm -fv cabal.project cabal.project.local
+ - rm -fv cabal.project.local
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- - "printf 'packages: \".\"\\n' > cabal.project"
- touch cabal.project.local
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- haddock | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
- cat cabal.project || true
@@ -72,14 +71,6 @@ install:
# 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
- - (cd "." && cabal sdist)
- - mv "."/dist/haddock-*.tar.gz ${DISTDIR}/
- - cd ${DISTDIR} || false
- - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- - "printf 'packages: haddock-*/*.cabal\\n' > cabal.project"
- - touch cabal.project.local
- - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- haddock | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
- cat cabal.project || true
- cat cabal.project.local || true
# this builds all libraries and executables (without tests/benchmarks)
@@ -90,7 +81,7 @@ script:
- if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
# cabal check
- - (cd haddock-* && cabal check)
+ - cabal check
# Build without installed constraints for packages in global-db
- if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi