git.iko.soy/typeable/wai
on master help sign in
updating travis.yml and stack.yaml.
4e98c7fKazu Yamamoto
.travis.yml+34−26
compare with master
unifiedsplit
@@ -39,9 +39,9 @@ matrix:
39 - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
39 - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
40 compiler: ": #GHC 8.0.2"
40 compiler: ": #GHC 8.0.2"
41 addons: {apt: {packages: [libfcgi-dev,cabal-install-1.24,ghc-8.0.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
41 addons: {apt: {packages: [libfcgi-dev,cabal-install-1.24,ghc-8.0.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
42− - env: BUILD=cabal GHCVER=8.2.1 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
42+ - env: BUILD=cabal GHCVER=8.2.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
43− compiler: ": #GHC 8.2.1"
43+ compiler: ": #GHC 8.2.2"
44− addons: {apt: {packages: [libfcgi-dev,cabal-install-1.24,ghc-8.2.1,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
44+ addons: {apt: {packages: [libfcgi-dev,cabal-install-1.24,ghc-8.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
45
45
46 # Build with the newest GHC and cabal-install. This is an accepted failure,
46 # Build with the newest GHC and cabal-install. This is an accepted failure,
47 # see below.
47 # see below.
@@ -51,61 +51,69 @@ matrix:
51
51
52 # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
52 # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
53 # variable, such as using --stack-yaml to point to a different file.
53 # variable, such as using --stack-yaml to point to a different file.
54− - env: BUILD=stack ARGS=""
54+ #- env: BUILD=stack ARGS=""
55− compiler: ": #stack default"
55+ # compiler: ": #stack default"
56− addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
56+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
57
57
58 #- env: BUILD=stack ARGS="--resolver lts-2"
58 #- env: BUILD=stack ARGS="--resolver lts-2"
59 # compiler: ": #stack 7.8.4"
59 # compiler: ": #stack 7.8.4"
60 # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
60 # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
61
61
62− - env: BUILD=stack ARGS="--resolver lts-3"
62+ #- env: BUILD=stack ARGS="--resolver lts-3"
63− compiler: ": #stack 7.10.2"
63+ # compiler: ": #stack 7.10.2"
64− addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
64+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
65
65
66 - env: BUILD=stack ARGS="--resolver lts-6"
66 - env: BUILD=stack ARGS="--resolver lts-6"
67 compiler: ": #stack 7.10.3"
67 compiler: ": #stack 7.10.3"
68 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
68 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
69
69
70− - env: BUILD=stack ARGS="--resolver lts-7"
70+ #- env: BUILD=stack ARGS="--resolver lts-7"
71− compiler: ": #stack 8.0.1"
71+ # compiler: ": #stack 8.0.1"
72− addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
72+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
73
73
74− - env: BUILD=stack ARGS="--resolver lts-8"
74+ - env: BUILD=stack ARGS="--resolver lts-9"
75 compiler: ": #stack 8.0.2"
75 compiler: ": #stack 8.0.2"
76 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
76 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
77
77
78+ - env: BUILD=stack ARGS="--resolver lts-10"
79+ compiler: ": #stack 8.2.2"
80+ addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
81+
78 # Nightly builds are allowed to fail
82 # Nightly builds are allowed to fail
79 - env: BUILD=stack ARGS="--resolver nightly"
83 - env: BUILD=stack ARGS="--resolver nightly"
80 compiler: ": #stack nightly"
84 compiler: ": #stack nightly"
81 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
85 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
82
86
83 # Build on OS X in addition to Linux
87 # Build on OS X in addition to Linux
84− - env: BUILD=stack ARGS=""
88+ #- env: BUILD=stack ARGS=""
85− compiler: ": #stack default osx"
89+ # compiler: ": #stack default osx"
86− os: osx
90+ # os: osx
87
91
88 # Travis includes an OS X which is incompatible with GHC 7.8.4
92 # Travis includes an OS X which is incompatible with GHC 7.8.4
89 #- env: BUILD=stack ARGS="--resolver lts-2"
93 #- env: BUILD=stack ARGS="--resolver lts-2"
90 # compiler: ": #stack 7.8.4 osx"
94 # compiler: ": #stack 7.8.4 osx"
91 # os: osx
95 # os: osx
92
96
93− - env: BUILD=stack ARGS="--resolver lts-3"
97+ #- env: BUILD=stack ARGS="--resolver lts-3"
94− compiler: ": #stack 7.10.2 osx"
98+ # compiler: ": #stack 7.10.2 osx"
95− os: osx
99+ # os: osx
96
100
97 - env: BUILD=stack ARGS="--resolver lts-6"
101 - env: BUILD=stack ARGS="--resolver lts-6"
98 compiler: ": #stack 7.10.3 osx"
102 compiler: ": #stack 7.10.3 osx"
99 os: osx
103 os: osx
100
104
101− - env: BUILD=stack ARGS="--resolver lts-7"
105+ #- env: BUILD=stack ARGS="--resolver lts-7"
102− compiler: ": #stack 8.0.1 osx"
106+ # compiler: ": #stack 8.0.1 osx"
103− os: osx
107+ # os: osx
104
108
105− - env: BUILD=stack ARGS="--resolver lts-8"
109+ - env: BUILD=stack ARGS="--resolver lts-9"
106 compiler: ": #stack 8.0.2 osx"
110 compiler: ": #stack 8.0.2 osx"
107 os: osx
111 os: osx
108
112
113+ - env: BUILD=stack ARGS="--resolver lts-10"
114+ compiler: ": #stack 8.2.2 osx"
115+ os: osx
116+
109 - env: BUILD=stack ARGS="--resolver nightly"
117 - env: BUILD=stack ARGS="--resolver nightly"
110 compiler: ": #stack nightly osx"
118 compiler: ": #stack nightly osx"
111 os: osx
119 os: osx
@@ -158,7 +166,7 @@ install:
158 # Avoid out of memory condition
166 # Avoid out of memory condition
159 stack --no-terminal --install-ghc $ARGS build Cabal
167 stack --no-terminal --install-ghc $ARGS build Cabal
160
168
161− stack --no-terminal --install-ghc $ARGS test --bench --only-dependencies
169+ stack --no-terminal --install-ghc $ARGS test --only-dependencies
162 ;;
170 ;;
163 cabal)
171 cabal)
164 cabal --version
172 cabal --version
@@ -181,10 +189,10 @@ script:
181 set -ex
189 set -ex
182 case "$BUILD" in
190 case "$BUILD" in
183 stack)
191 stack)
184− stack --no-terminal $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps
192+ stack --no-terminal $ARGS test --haddock --no-haddock-deps
185 ;;
193 ;;
186 cabal)
194 cabal)
187− cabal install --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --max-backjumps=-1 $CABALARGS $PACKAGES
195+ cabal install --enable-tests --force-reinstalls --ghc-options=-O0 --max-backjumps=-1 $CABALARGS $PACKAGES
188
196
189 ORIGDIR=$(pwd)
197 ORIGDIR=$(pwd)
190 for dir in $PACKAGES
198 for dir in $PACKAGES
stack.yaml+2−12
@@ -1,4 +1,4 @@
1−resolver: lts-4.1
1+resolver: lts-10.0
2packages:
2packages:
3- ./auto-update
3- ./auto-update
4- ./mime-types
4- ./mime-types
@@ -14,18 +14,8 @@ flags:
14 wai-extra:
14 wai-extra:
15 build-example: true
15 build-example: true
16extra-deps:
16extra-deps:
17−- http2-1.6.0
18−- cryptonite-0.23
19−- memory-0.14.6
20−- tls-1.3.11
21−- fast-logger-2.4.5
22−- wai-logger-2.2.7
23−- http-types-0.9.1
24−- x509-1.6.5
25−- x509-validation-1.6.5
26−- foundation-0.0.12
27−- psqueues-0.2.3.0
28- tls-session-manager-0.0.0.2
17- tls-session-manager-0.0.0.2
18+- psqueues-0.2.4.0
29nix:
19nix:
30 enable: false
20 enable: false
31 packages:
21 packages:
warp/warp.cabal+4−1
@@ -173,7 +173,8 @@ Test-Suite spec
173 , word8
173 , word8
174 , hashable
174 , hashable
175 , http-date
175 , http-date
176+ if impl(ghc < 8)
176− , semigroups
177+ Build-Depends: semigroups
177
178
178 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
179 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
179 Cpp-Options: -DSENDFILEFD
180 Cpp-Options: -DSENDFILEFD
@@ -196,6 +197,8 @@ Benchmark parser
196 , network
197 , network
197 , network
198 , network
198 , unix-compat
199 , unix-compat
200+ if impl(ghc < 8)
201+ Build-Depends: semigroups
199
202
200 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
203 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
201 Cpp-Options: -DSENDFILEFD
204 Cpp-Options: -DSENDFILEFD