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

Commit 5aecb99

Browse files
committed
Update Travis-CI build instructions.
- Update ghc-8.6.2 to 8.6.3. - We don't use installed constraints, so we don't need a separate build step that builds without them. - Use latest make-travis-yml generator and drop the container-based build environment. Closes #10. - Enable install-examples flag to make sure the examples get built.
1 parent ce0a291 commit 5aecb99

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

.travis.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# runghc make_travis_yml_2.hs '--doctest' '--hlint' '-o' '.travis.yml' 'hackage-db.cabal'
3+
# runghc make_travis_yml_2.hs '--doctest' '--hlint' '-o' '.travis.yml' 'hackage-db.cabal' '--no-unconstrained'
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
77
language: c
8-
sudo: false
98

109
git:
1110
submodules: false # whether to recursively clone submodules
@@ -28,9 +27,9 @@ before_cache:
2827

2928
matrix:
3029
include:
31-
- compiler: "ghc-8.6.2"
30+
- compiler: "ghc-8.6.3"
3231
# env: TEST=--disable-tests BENCH=--disable-benchmarks
33-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.2], sources: [hvr-ghc]}}
32+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
3433
- compiler: "ghc-8.4.4"
3534
# env: TEST=--disable-tests BENCH=--disable-benchmarks
3635
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
@@ -75,9 +74,10 @@ install:
7574
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7675
- (cd /tmp && echo '' | cabal new-repl -w ${HC} --build-dep fail)
7776
- 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 80602 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi
77+
- if [ $HCNUMVER -eq 80603 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi
7978
- "printf 'packages: \".\"\\n' > cabal.project"
80-
- "printf 'write-ghc-environment-files: always' >> cabal.project"
79+
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
80+
- "printf 'package hackage-db\\n flags: +install-examples\\n' >> cabal.project"
8181
- touch cabal.project.local
8282
- "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"
8383
- cat cabal.project || true
@@ -100,7 +100,8 @@ script:
100100
- cd ${DISTDIR} || false
101101
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
102102
- "printf 'packages: hackage-db-*/*.cabal\\n' > cabal.project"
103-
- "printf 'write-ghc-environment-files: always' >> cabal.project"
103+
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
104+
- "printf 'package hackage-db\\n flags: +install-examples\\n' >> cabal.project"
104105
- touch cabal.project.local
105106
- "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"
106107
- cat cabal.project || true
@@ -115,16 +116,13 @@ script:
115116
- if [ $HCNUMVER -ge 80000 ]; then (cd hackage-db-* && doctest src); fi
116117

117118
# hlint
118-
- if [ $HCNUMVER -eq 80602 ]; then (cd hackage-db-* && hlint src); fi
119+
- if [ $HCNUMVER -eq 80603 ]; then (cd hackage-db-* && hlint src); fi
119120

120121
# cabal check
121122
- (cd hackage-db-* && cabal check)
122123

123124
# haddock
124125
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
125126

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

hackage-db.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ synopsis: Access cabal-install's Hackage database via Data.Map
1111
cabal-version: >= 1.10
1212
build-type: Simple
1313
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.4, GHC == 8.6.2
14+
, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.3
1515

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

0 commit comments

Comments
 (0)