Skip to content

Commit 9a8e748

Browse files
committed
Regenerate .travis.yml.
1 parent b1d8b6d commit 9a8e748

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed

.travis.yml

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# runghc make_travis_yml_2.hs 'ekg-core.cabal'
44
#
5-
# For more information, see https://github.com/hvr/multi-ghc-travis
5+
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
77
language: c
88
sudo: false
@@ -28,24 +28,24 @@ before_cache:
2828

2929
matrix:
3030
include:
31-
- compiler: "ghc-7.6.3"
32-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
33-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.6.3], sources: [hvr-ghc]}}
34-
- compiler: "ghc-7.8.4"
31+
- compiler: "ghc-8.4.3"
3532
# env: TEST=--disable-tests BENCH=--disable-benchmarks
36-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
37-
- compiler: "ghc-7.10.3"
33+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
34+
- compiler: "ghc-8.2.2"
3835
# env: TEST=--disable-tests BENCH=--disable-benchmarks
39-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
36+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
4037
- compiler: "ghc-8.0.2"
4138
# env: TEST=--disable-tests BENCH=--disable-benchmarks
42-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
43-
- compiler: "ghc-8.2.2"
39+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
40+
- compiler: "ghc-7.10.3"
41+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
42+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
43+
- compiler: "ghc-7.8.4"
4444
# env: TEST=--disable-tests BENCH=--disable-benchmarks
45-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
46-
- compiler: "ghc-8.4.1"
45+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
46+
- compiler: "ghc-7.6.3"
4747
# env: TEST=--disable-tests BENCH=--disable-benchmarks
48-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
48+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.6.3], sources: [hvr-ghc]}}
4949

5050
before_install:
5151
- HC=${CC}
@@ -63,14 +63,18 @@ install:
6363
- BENCH=${BENCH---enable-benchmarks}
6464
- TEST=${TEST---enable-tests}
6565
- HADDOCK=${HADDOCK-true}
66-
- INSTALLED=${INSTALLED-true}
66+
- UNCONSTRAINED=${UNCONSTRAINED-true}
67+
- NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
6768
- GHCHEAD=${GHCHEAD-false}
6869
- travis_retry cabal update -v
6970
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
7071
- rm -fv cabal.project cabal.project.local
7172
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7273
- "printf 'packages: \".\"\\n' > cabal.project"
73-
- cat cabal.project
74+
- touch cabal.project.local
75+
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- ekg-core | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
76+
- cat cabal.project || true
77+
- cat cabal.project.local || true
7478
- if [ -f "./configure.ac" ]; then
7579
(cd "." && autoreconf -i);
7680
fi
@@ -89,13 +93,13 @@ script:
8993
- cd ${DISTDIR} || false
9094
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
9195
- "printf 'packages: ekg-core-*/*.cabal\\n' > cabal.project"
92-
- cat cabal.project
96+
- touch cabal.project.local
97+
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- ekg-core | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
98+
- cat cabal.project || true
99+
- cat cabal.project.local || true
93100
# this builds all libraries and executables (without tests/benchmarks)
94101
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
95102

96-
# Build with installed constraints for packages in global-db
97-
- if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
98-
99103
# build & run tests, build benchmarks
100104
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
101105

@@ -106,5 +110,8 @@ script:
106110
- rm -rf ./dist-newstyle
107111
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
108112

113+
# Build without installed constraints for packages in global-db
114+
- 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
115+
109116
# REGENDATA ["ekg-core.cabal"]
110117
# EOF

ekg-core.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ category: System
1414
build-type: Simple
1515
extra-source-files: CHANGES.md
1616
cabal-version: >=1.10
17-
tested-with: GHC == 8.4.1, GHC == 8.2.2, GHC == 8.0.2,
17+
tested-with: GHC == 8.4.3, GHC == 8.2.2, GHC == 8.0.2,
1818
GHC == 7.10.3, GHC == 7.8.4, GHC == 7.6.3
1919

2020
library

0 commit comments

Comments
 (0)