git.iko.soy/typeable/openapi3
on master help sign in
Relax bounds for GHC-8.8
commit0ac8718c87175bdabe9c0faf31eac0d3060afbc8 authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 17 May 2019, 10:13 (7 years ago) parent82b75a4
2 files changed+28−9
.travis.yml+23−5 swagger2.cabal+5−4
.travis.yml+23−5
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.3.20190413
7+# version: 0.3.20190429
88#
99language: c
1010dist: xenial
@@ -29,8 +29,11 @@ before_cache:
2929 - rm -rfv $CABALHOME/packages/head.hackage
3030matrix:
3131 include:
32− - compiler: ghc-8.6.4
33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
32+ - compiler: ghc-8.8.1
33+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
34+ env: GHCHEAD=true
35+ - compiler: ghc-8.6.5
36+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
3437 - compiler: ghc-8.4.4
3538 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
3639 - compiler: ghc-8.2.2
@@ -41,6 +44,8 @@ matrix:
4144 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
4245 - compiler: ghc-7.8.4
4346 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
47+ allow_failures:
48+ - compiler: ghc-8.8.1
4449before_install:
4550 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
4651 - HCPKG="$HC-pkg"
@@ -86,12 +91,25 @@ install:
8691 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
8792 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
8893 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
94+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
8995 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
9096 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
9197 echo "install-dirs user" >> $CABALHOME/config
9298 echo " prefix: $CABALHOME" >> $CABALHOME/config
9399 echo "repository hackage.haskell.org" >> $CABALHOME/config
94100 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
101+ - |
102+ if $GHCHEAD; then
103+ echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config
104+
105+ echo "repository head.hackage" >> $CABALHOME/config
106+ echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config
107+ echo " secure: True" >> $CABALHOME/config
108+ echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config
109+ echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config
110+ echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config
111+ echo " key-threshold: 3" >> $CABALHOME/config
112+ fi
95113 - cat $CABALHOME/config
96114 - rm -fv cabal.project cabal.project.local cabal.project.freeze
97115 - travis_retry ${CABAL} v2-update -v
@@ -102,7 +120,7 @@ install:
102120 echo 'packages: "."' >> cabal.project
103121 - |
104122 echo "write-ghc-environment-files: always" >> cabal.project
105− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(swagger2)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
123+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(swagger2)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
106124 - cat cabal.project || true
107125 - cat cabal.project.local || true
108126 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
@@ -126,7 +144,7 @@ script:
126144 echo 'packages: "swagger2-*/*.cabal"' >> cabal.project
127145 - |
128146 echo "write-ghc-environment-files: always" >> cabal.project
129− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(swagger2)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
147+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(swagger2)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
130148 - cat cabal.project || true
131149 - cat cabal.project.local || true
132150 # Building...
swagger2.cabal+5−4
@@ -29,7 +29,8 @@ tested-with:
2929 || ==8.0.2
3030 || ==8.2.2
3131 || ==8.4.4
32− || ==8.6.4
32+ || ==8.6.5
33+ || ==8.8.1
3334
3435custom-setup
3536 setup-depends:
@@ -64,7 +65,7 @@ library
6465 , bytestring >=0.10.4.0 && <0.11
6566 , containers >=0.5.5.1 && <0.7
6667 , template-haskell >=2.9.0.0 && <2.15
67− , time >=1.4.2 && <1.9
68+ , time >=1.4.2 && <1.10
6869 , transformers >=0.3.0.0 && <0.6
6970
7071 build-depends:
@@ -78,11 +79,11 @@ library
7879 -- cookie 0.4.3 is needed by GHC 7.8 due to time>=1.4 constraint
7980 , cookie >=0.4.3 && <0.5
8081 , generics-sop >=0.3.2.0 && <0.6
81− , hashable >=1.2.7.0 && <1.3
82+ , hashable >=1.2.7.0 && <1.4
8283 , http-media >=0.7.1.2 && <0.9
8384 , insert-ordered-containers >=0.2.1.0 && <0.3
8485 , lens >=4.16.1 && <4.18
85− , network >=2.6.3.5 && <3.1
86+ , network >=2.6.3.5 && <3.2
8687 , scientific >=0.3.6.2 && <0.4
8788 , transformers-compat >=0.3 && <0.7
8889 , unordered-containers >=0.2.9.0 && <0.3