Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.

Commit 4c901ce

Browse files
petipeti
committed
Update travis-ci build script to include ghc-8.6.1.
1 parent edac2a6 commit 4c901ce

File tree

2 files changed

+33
-21
lines changed

2 files changed

+33
-21
lines changed

‎.travis.yml

+31-19
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# runghc make_travis_yml_2.hs '--no-installed' '--doctest' '--hlint' '-o' '.travis.yml' 'hackage-db.cabal'
3+
# runghc make_travis_yml_2.hs '--doctest' '--hlint' '-o' '.travis.yml' 'hackage-db.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,27 @@ before_cache:
2828

2929
matrix:
3030
include:
31+
- compiler: "ghc-8.6.1"
32+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
33+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
3134
- compiler: "ghc-8.4.3"
3235
# env: TEST=--disable-tests BENCH=--disable-benchmarks
33-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
36+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
3437
- compiler: "ghc-8.2.2"
3538
# env: TEST=--disable-tests BENCH=--disable-benchmarks
36-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
39+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
3740
- compiler: "ghc-8.0.2"
3841
# env: TEST=--disable-tests BENCH=--disable-benchmarks
39-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
42+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4043
- compiler: "ghc-7.10.3"
4144
# 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]}}
45+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
4346
- compiler: "ghc-7.8.4"
4447
# env: TEST=--disable-tests BENCH=--disable-benchmarks
45-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
48+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
4649
- compiler: "ghc-7.6.3"
4750
# env: TEST=--disable-tests BENCH=--disable-benchmarks
48-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.6.3], sources: [hvr-ghc]}}
51+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.6.3], sources: [hvr-ghc]}}
4952

5053
before_install:
5154
- HC=${CC}
@@ -63,16 +66,21 @@ install:
6366
- BENCH=${BENCH---enable-benchmarks}
6467
- TEST=${TEST---enable-tests}
6568
- HADDOCK=${HADDOCK-true}
66-
- INSTALLED=${INSTALLED-true}
69+
- UNCONSTRAINED=${UNCONSTRAINED-true}
70+
- NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
6771
- GHCHEAD=${GHCHEAD-false}
6872
- travis_retry cabal update -v
6973
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
7074
- rm -fv cabal.project cabal.project.local
7175
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
72-
- if [ $HCNUMVER -ge 80000 ]; then cabal new-install -w ${HC} --symlink-bindir=$HOME/.local/bin doctest --constraint='doctest ==0.15.*'; fi
73-
- if [ $HCNUMVER -eq 80202 ]; then cabal new-install -w ${HC} --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi
76+
- (cd /tmp && echo '' | cabal new-repl -w ${HC} --build-dep fail)
77+
- if [ $HCNUMVER -ge 80000 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin doctest --constraint='doctest ==0.16.*'; fi
78+
- if [ $HCNUMVER -eq 80404 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi
7479
- "printf 'packages: \".\"\\n' > cabal.project"
75-
- cat cabal.project
80+
- touch cabal.project.local
81+
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- hackage-db | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
82+
- cat cabal.project || true
83+
- cat cabal.project.local || true
7684
- if [ -f "./configure.ac" ]; then
7785
(cd "." && autoreconf -i);
7886
fi
@@ -86,31 +94,35 @@ install:
8694
# any command which exits with a non-zero exit code causes the build to fail.
8795
script:
8896
# test that source-distributions can be generated
89-
- (cd "." && cabal sdist)
90-
- mv "."/dist/hackage-db-*.tar.gz ${DISTDIR}/
97+
- cabal new-sdist all
98+
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
9199
- cd ${DISTDIR} || false
92100
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
93101
- "printf 'packages: hackage-db-*/*.cabal\\n' > cabal.project"
94-
- cat cabal.project
102+
- touch cabal.project.local
103+
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- hackage-db | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
104+
- cat cabal.project || true
105+
- cat cabal.project.local || true
95106
# this builds all libraries and executables (without tests/benchmarks)
96107
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
97108

98-
99109
# build & run tests, build benchmarks
100110
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
101111

102112
# doctest
103113
- if [ $HCNUMVER -ge 80000 ]; then (cd hackage-db-* && doctest src); fi
104114

105115
# hlint
106-
- if [ $HCNUMVER -eq 80202 ]; then (cd hackage-db-* && hlint src); fi
116+
- if [ $HCNUMVER -eq 80403 ]; then (cd hackage-db-* && hlint src); fi
107117

108118
# cabal check
109119
- (cd hackage-db-* && cabal check)
110120

111121
# haddock
112-
- rm -rf ./dist-newstyle
113122
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
114123

115-
# REGENDATA ["--no-installed","--doctest","--hlint","-o",".travis.yml","hackage-db.cabal"]
124+
# Build without installed constraints for packages in global-db
125+
- 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
126+
127+
# REGENDATA ["--doctest","--hlint","-o",".travis.yml","hackage-db.cabal"]
116128
# EOF

‎hackage-db.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ category: Distribution
1010
synopsis: Access cabal-install's Hackage database via Data.Map
1111
cabal-version: >= 1.10
1212
build-type: Simple
13-
tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3
14-
, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3
13+
tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2
14+
, GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1
1515

1616
description:
1717
This library provides convenient access to the local copy of the Hackage

0 commit comments

Comments
 (0)