diff --git a/.travis.yml b/.travis.yml index 830a0873b5d4dd690101f292363840f99cd6ab71..e2af694bf99348dab7ec34ffd82f541057c8be8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -129,7 +129,7 @@ install: - | echo "packages: ." >> cabal.project - | - - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(hsc2hs)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(hsc2hs|process)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi @@ -154,7 +154,7 @@ script: - | echo "packages: ${PKGDIR_hsc2hs}" >> cabal.project - | - - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(hsc2hs)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(hsc2hs|process)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true # Building... @@ -168,8 +168,8 @@ script: # cabal check... - (cd ${PKGDIR_hsc2hs} && ${CABAL} -vnormal check) # Building without installed constraints for packages in global-db... - - if [ $HCNUMVER -ge 70200 ] ; then rm -f cabal.project.local ; fi - - if [ $HCNUMVER -ge 70200 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output ; fi + - rm -f cabal.project.local + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output # REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"] # EOF diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 0f2da1430fcae3ead9fbd4b626eeffbe0860b936..df09241203c47a124ac6ff60908b41e6fc9806aa 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,4 +1,4 @@ ghc-head: True tests: >=7.4 benchmarks: >=7.4 -unconstrained: >=7.2 +installed: +all -process