Skip to content

Commit 6d090e5

Browse files
phadejphadej
authored
Merge pull request #114 from haskell-servant/swagger2-2.5
Add swagger2-2.5 constraint-set to CI
2 parents 2f4437c + 67a29cf commit 6d090e5

File tree

3 files changed

+45
-24
lines changed

3 files changed

+45
-24
lines changed

‎.travis.yml

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7-
# version: 0.5.20190908
7+
# version: 0.9.20191209
88
#
9+
version: ~> 1.0
910
language: c
11+
os: linux
1012
dist: xenial
1113
git:
1214
# whether to recursively clone submodules
@@ -18,6 +20,7 @@ cache:
1820
directories:
1921
- $HOME/.cabal/packages
2022
- $HOME/.cabal/store
23+
- $HOME/.hlint
2124
before_cache:
2225
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2326
# remove files that are regenerated by 'cabal update'
@@ -27,18 +30,23 @@ before_cache:
2730
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
2831
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
2932
- rm -rfv $CABALHOME/packages/head.hackage
30-
matrix:
33+
jobs:
3134
include:
3235
- compiler: ghc-8.8.1
33-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
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"]}}
37+
os: linux
3438
- compiler: ghc-8.6.5
35-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
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"]}}
40+
os: linux
3641
- compiler: ghc-8.4.4
37-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
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
3844
- compiler: ghc-8.2.2
39-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
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
4047
- compiler: ghc-8.0.2
41-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
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+
os: linux
4250
before_install:
4351
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
4452
- WITHCOMPILER="-w $HC"
@@ -79,21 +87,29 @@ install:
7987
- HEADHACKAGE=false
8088
- rm -f $CABALHOME/config
8189
- |
82-
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
83-
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
84-
echo "write-ghc-environment-files: always" >> $CABALHOME/config
85-
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
86-
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
87-
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
88-
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
89-
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
90-
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
91-
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
92-
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
93-
echo "install-dirs user" >> $CABALHOME/config
94-
echo " prefix: $CABALHOME" >> $CABALHOME/config
95-
echo "repository hackage.haskell.org" >> $CABALHOME/config
96-
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
90+
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
91+
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
92+
echo "write-ghc-environment-files: always" >> $CABALHOME/config
93+
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
94+
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
95+
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
96+
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
97+
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
98+
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
99+
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
100+
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
101+
echo "install-dirs user" >> $CABALHOME/config
102+
echo " prefix: $CABALHOME" >> $CABALHOME/config
103+
echo "repository hackage.haskell.org" >> $CABALHOME/config
104+
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
105+
echo " secure: True" >> $CABALHOME/config
106+
echo " key-threshold: 3" >> $CABALHOME/config
107+
echo " root-keys:" >> $CABALHOME/config
108+
echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
109+
echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
110+
echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
111+
echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
112+
echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
97113
- |
98114
echo "program-default-options" >> $CABALHOME/config
99115
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -157,10 +173,12 @@ script:
157173
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='swagger2 ==2.3.*' all | color_cabal_output ; fi
158174
# Constraint set swagger2-2.4
159175
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='swagger2 ==2.4.*' all | color_cabal_output
176+
# Constraint set swagger2-2.5
177+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='swagger2 ==2.5.*' all | color_cabal_output
160178
# Constraint set servant-0.15
161179
- if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant == 0.15.*' all | color_cabal_output ; fi
162180
# Constraint set servant-0.16
163181
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant == 0.16.*' all | color_cabal_output
164182

165-
# REGENDATA ["--config=cabal.haskell-ci","cabal.project"]
183+
# REGENDATA ("0.9.20191209",["--config=cabal.haskell-ci","cabal.project"])
166184
# EOF

‎cabal.haskell-ci

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ constraint-set swagger2-2.3
77
constraint-set swagger2-2.4
88
constraints: swagger2 ==2.4.*
99

10+
constraint-set swagger2-2.5
11+
constraints: swagger2 ==2.5.*
12+
1013
constraint-set servant-0.15
1114
ghc: <8.8
1215
constraints: servant == 0.15.*

‎servant-swagger.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: servant-swagger
22
version: 1.1.7.1
3-
x-revision: 1
3+
x-revision: 2
44
synopsis: Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.
55
description:
66
Swagger is a project used to describe and document RESTful APIs. The core of the

0 commit comments

Comments
 (0)