Skip to content

Commit 38fa53e

Browse files
maksbotanmaksbotan
committed
haskell-ci regenerate
1 parent ddedacb commit 38fa53e

File tree

3 files changed

+39
-20
lines changed

3 files changed

+39
-20
lines changed

‎.travis.yml‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
#
33
# haskell-ci '--config=cabal.haskell-ci' 'cabal.project'
44
#
5+
# To regenerate the script (for example after adjusting tested-with) run
6+
#
7+
# haskell-ci regenerate
8+
#
59
# For more information, see https://github.com/haskell-CI/haskell-ci
610
#
7-
# version: 0.9.20200121
11+
# version: 0.10.1
812
#
913
version: ~> 1.0
1014
language: c
@@ -32,20 +36,17 @@ before_cache:
3236
- rm -rfv $CABALHOME/packages/head.hackage
3337
jobs:
3438
include:
35-
- compiler: ghc-8.8.1
36-
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
39+
- compiler: ghc-8.10.1
40+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.2"]}}
41+
os: linux
42+
- compiler: ghc-8.8.3
43+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.2"]}}
3744
os: linux
3845
- compiler: ghc-8.6.5
39-
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
46+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
4047
os: linux
4148
- compiler: ghc-8.4.4
42-
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
43-
os: linux
44-
- compiler: ghc-8.2.2
45-
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
46-
os: linux
47-
- compiler: ghc-8.0.2
48-
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
49+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
4950
os: linux
5051
before_install:
5152
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
@@ -95,17 +96,24 @@ install:
9596
- touch cabal.project
9697
- |
9798
echo "packages: ." >> cabal.project
99+
- echo 'package servant-swagger' >> cabal.project
100+
- "echo ' ghc-options: -Werror=missing-methods' >> cabal.project"
98101
- |
99-
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
102+
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
103+
echo "" >> cabal.project
104+
echo "source-repository-package" >> cabal.project
105+
echo " type: git" >> cabal.project
106+
echo " location: https://github.com/biocad/swagger2/" >> cabal.project
107+
echo " tag: dd86d6189adb72df09626c3576f4169e73c21e1e" >> cabal.project
100108
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-swagger)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
101109
- cat cabal.project || true
102110
- cat cabal.project.local || true
103111
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
104112
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
105113
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
106114
- rm cabal.project.freeze
107-
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
108-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
115+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
116+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
109117
script:
110118
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
111119
# Packaging...
@@ -121,8 +129,15 @@ script:
121129
- touch cabal.project
122130
- |
123131
echo "packages: ${PKGDIR_servant_swagger}" >> cabal.project
132+
- echo 'package servant-swagger' >> cabal.project
133+
- "echo ' ghc-options: -Werror=missing-methods' >> cabal.project"
124134
- |
125-
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
135+
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
136+
echo "" >> cabal.project
137+
echo "source-repository-package" >> cabal.project
138+
echo " type: git" >> cabal.project
139+
echo " location: https://github.com/biocad/swagger2/" >> cabal.project
140+
echo " tag: dd86d6189adb72df09626c3576f4169e73c21e1e" >> cabal.project
126141
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-swagger)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
127142
- cat cabal.project || true
128143
- cat cabal.project.local || true
@@ -152,5 +167,5 @@ script:
152167
# Constraint set servant-0.17
153168
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant == 0.17.*' all
154169

155-
# REGENDATA ("0.9.20200121",["--config=cabal.haskell-ci","cabal.project"])
170+
# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","cabal.project"])
156171
# EOF

‎cabal.project‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
packages: .
22
allow-newer: aeson-pretty-0.8.7:base-compat
3+
4+
source-repository-package
5+
type: git
6+
location: https://github.com/biocad/swagger2/
7+
tag: dd86d6189adb72df09626c3576f4169e73c21e1e

‎servant-swagger.cabal‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ category: Web, Servant, Swagger
2929
build-type: Custom
3030
cabal-version: 1.18
3131
tested-with:
32-
GHC ==8.0.2
33-
|| ==8.2.2
34-
|| ==8.4.4
32+
GHC ==8.4.4
3533
|| ==8.6.5
36-
|| ==8.8.1
34+
|| ==8.8.3
35+
|| ==8.10.1
3736

3837
extra-source-files:
3938
README.md

0 commit comments

Comments
 (0)