Skip to content

Commit 4224b7d

Browse files
phadejphadej
authored
Merge pull request #1 from phadej/update-travis-2019-03
Regenerate .travis.yml
2 parents 29eebf2 + c148dd9 commit 4224b7d

File tree

2 files changed

+70
-75
lines changed

2 files changed

+70
-75
lines changed

‎.travis.yml

Lines changed: 68 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# runghc make_travis_yml_2.hs '--output' '.travis.yml' '--ghc-head' 'postgresql-libpq.cabal'
3+
# haskell-ci '--output' '.travis.yml' '--ghc-head' 'postgresql-libpq.cabal'
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7+
# version: 0.3
8+
#
79
language: c
8-
sudo: false
10+
dist: xenial
911

1012
git:
1113
submodules: false # whether to recursively clone submodules
@@ -16,140 +18,133 @@ cache:
1618
- $HOME/.cabal/store
1719

1820
before_cache:
19-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
21+
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2022
# remove files that are regenerated by 'cabal update'
21-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
22-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
23-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
24-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
25-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
23+
- rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
24+
- rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
25+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
26+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
27+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
2628

27-
- rm -rfv $HOME/.cabal/packages/head.hackage
29+
- rm -rfv $CABALHOME/packages/head.hackage
2830

2931
matrix:
3032
include:
31-
- compiler: "ghc-8.6.1"
32-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
33-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1], sources: [hvr-ghc]}}
34-
- compiler: "ghc-8.4.3"
35-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
36-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
33+
- compiler: "ghc-8.6.4"
34+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.4], sources: [hvr-ghc]}}
35+
- compiler: "ghc-8.4.4"
36+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
3737
- compiler: "ghc-8.2.2"
38-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
39-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
38+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4039
- compiler: "ghc-8.0.2"
41-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
42-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
40+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4341
- compiler: "ghc-7.10.3"
44-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
45-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
42+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
4643
- compiler: "ghc-7.8.4"
47-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
48-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
44+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
4945
- compiler: "ghc-7.6.3"
50-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
51-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.6.3], sources: [hvr-ghc]}}
46+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.6.3], sources: [hvr-ghc]}}
5247
- compiler: "ghc-7.4.2"
53-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
54-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.4.2], sources: [hvr-ghc]}}
48+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.4.2], sources: [hvr-ghc]}}
5549
- compiler: "ghc-7.2.2"
56-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
57-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.2.2], sources: [hvr-ghc]}}
50+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.2.2], sources: [hvr-ghc]}}
5851
- compiler: "ghc-7.0.4"
59-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
60-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.0.4], sources: [hvr-ghc]}}
52+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.0.4], sources: [hvr-ghc]}}
6153
- compiler: "ghc-head"
6254
env: GHCHEAD=true
6355
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
6456

6557
allow_failures:
66-
- compiler: "ghc-7.0.4"
6758
- compiler: "ghc-head"
6859

6960
before_install:
70-
- HC=${CC}
61+
- HC=/opt/ghc/bin/${CC}
7162
- HCPKG=${HC/ghc/ghc-pkg}
7263
- unset CC
64+
- CABAL=/opt/ghc/bin/cabal
65+
- CABALHOME=$HOME/.cabal
66+
- export PATH="$CABALHOME/bin:$PATH"
7367
- ROOTDIR=$(pwd)
74-
- mkdir -p $HOME/.local/bin
75-
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
7668
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
7769
- echo $HCNUMVER
7870

7971
install:
80-
- cabal --version
72+
- ${CABAL} --version
8173
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
82-
- BENCH=${BENCH---enable-benchmarks}
83-
- TEST=${TEST---enable-tests}
84-
- HADDOCK=${HADDOCK-true}
85-
- UNCONSTRAINED=${UNCONSTRAINED-true}
86-
- NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
74+
- TEST=--enable-tests
75+
- BENCH=--enable-benchmarks
8776
- GHCHEAD=${GHCHEAD-false}
88-
- travis_retry cabal update -v
89-
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
77+
- travis_retry ${CABAL} update -v
78+
- sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config
9079
- rm -fv cabal.project cabal.project.local
9180
# Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
9281
- |
9382
if $GHCHEAD; then
94-
sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
95-
for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" ${HOME}/.cabal/config; done
83+
sed -i 's/-- allow-newer: .*/allow-newer: *:base/' $CABALHOME/config
84+
for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" $CABALHOME/config; done
9685
97-
echo 'repository head.hackage' >> ${HOME}/.cabal/config
98-
echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
99-
echo ' secure: True' >> ${HOME}/.cabal/config
100-
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
101-
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
102-
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
103-
echo ' key-threshold: 3' >> ${HOME}/.cabal.config
86+
echo 'repository head.hackage' >> $CABALHOME/config
87+
echo ' url: http://head.hackage.haskell.org/' >> $CABALHOME/config
88+
echo ' secure: True' >> $CABALHOME/config
89+
echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> $CABALHOME/config
90+
echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> $CABALHOME/config
91+
echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> $CABALHOME/config
92+
echo ' key-threshold: 3' >> $CABALHOME.config
10493
105-
grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
94+
grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
10695
107-
cabal new-update head.hackage -v
96+
${CABAL} new-update head.hackage -v
10897
fi
109-
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
110-
- "printf 'packages: \".\"\\n' > cabal.project"
98+
- grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
99+
- rm -f cabal.project
100+
- touch cabal.project
101+
- "printf 'packages: \".\"\\n' >> cabal.project"
102+
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
111103
- touch cabal.project.local
112-
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- postgresql-libpq | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
104+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(postgresql-libpq)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
113105
- cat cabal.project || true
114106
- cat cabal.project.local || true
115-
- if [ -f "./configure.ac" ]; then
116-
(cd "." && autoreconf -i);
117-
fi
107+
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
118108
- rm -f cabal.project.freeze
119-
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
120-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
109+
- ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry
110+
- "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
111+
- rm "cabal.project.freeze"
112+
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
113+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
121114
- rm -rf .ghc.environment.* "."/dist
122115
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
123116

124117
# Here starts the actual work to be performed for the package under test;
125118
# any command which exits with a non-zero exit code causes the build to fail.
126119
script:
127120
# test that source-distributions can be generated
128-
- (cd "." && cabal sdist)
129-
- mv "."/dist/postgresql-libpq-*.tar.gz ${DISTDIR}/
121+
- ${CABAL} new-sdist all
122+
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
130123
- cd ${DISTDIR} || false
131124
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
132-
- "printf 'packages: postgresql-libpq-*/*.cabal\\n' > cabal.project"
125+
- rm -f cabal.project
126+
- touch cabal.project
127+
- "printf 'packages: \"postgresql-libpq-*/*.cabal\"\\n' >> cabal.project"
128+
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
133129
- touch cabal.project.local
134-
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- postgresql-libpq | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
130+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(postgresql-libpq)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
135131
- cat cabal.project || true
136132
- cat cabal.project.local || true
137133
# this builds all libraries and executables (without tests/benchmarks)
138-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
134+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all
139135

140136
# build & run tests, build benchmarks
141-
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
142-
- if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
137+
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
138+
- ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all
143139

144140
# cabal check
145-
- (cd postgresql-libpq-* && cabal check)
141+
- (cd postgresql-libpq-* && ${CABAL} check)
146142

147143
# haddock
148-
- rm -rf ./dist-newstyle
149-
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
144+
- ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all
150145

151146
# Build without installed constraints for packages in global-db
152-
- 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
147+
- rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all;
153148

154149
# REGENDATA ["--output",".travis.yml","--ghc-head","postgresql-libpq.cabal"]
155150
# EOF

‎postgresql-libpq.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Tested-with:
2929
GHC==7.10.3,
3030
GHC==8.0.2,
3131
GHC==8.2.2,
32-
GHC==8.4.3,
33-
GHC==8.6.1
32+
GHC==8.4.4,
33+
GHC==8.6.4
3434

3535
extra-source-files:
3636
CHANGELOG.md

0 commit comments

Comments
 (0)