git.iko.soy/typeable/wai
on master help sign in
updating travis.yml and stack.yaml.

- no compiling of benchmark stuff to save time. - minimum extra-deps. - testing with only three major GHCs. - using semigroups only for GHC 7.10.

commit4e98c7f0d9648eabbbcbb429ee079d6d33b5b15d authorKazu Yamamoto <kazu@iij.ad.jp> dateFri 12 Jan 2018, 11:04 (9 years ago) parenta6cf131
3 files changed+40−39
compare with master
unifiedsplit
.travis.yml+34−26 stack.yaml+2−12 warp/warp.cabal+4−1
.travis.yml+34−26
@@ -39,9 +39,9 @@ matrix:
3939 - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
4040 compiler: ": #GHC 8.0.2"
4141 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
43− compiler: ": #GHC 8.2.1"
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]}}
42+ - env: BUILD=cabal GHCVER=8.2.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
43+ compiler: ": #GHC 8.2.2"
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]}}
4545
4646 # Build with the newest GHC and cabal-install. This is an accepted failure,
4747 # see below.
@@ -51,61 +51,69 @@ matrix:
5151
5252 # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
5353 # variable, such as using --stack-yaml to point to a different file.
54− - env: BUILD=stack ARGS=""
55− compiler: ": #stack default"
56− addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
54+ #- env: BUILD=stack ARGS=""
55+ # compiler: ": #stack default"
56+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
5757
5858 #- env: BUILD=stack ARGS="--resolver lts-2"
5959 # compiler: ": #stack 7.8.4"
6060 # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
6161
62− - env: BUILD=stack ARGS="--resolver lts-3"
63− compiler: ": #stack 7.10.2"
64− addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
62+ #- env: BUILD=stack ARGS="--resolver lts-3"
63+ # compiler: ": #stack 7.10.2"
64+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
6565
6666 - env: BUILD=stack ARGS="--resolver lts-6"
6767 compiler: ": #stack 7.10.3"
6868 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
6969
70− - env: BUILD=stack ARGS="--resolver lts-7"
71− compiler: ": #stack 8.0.1"
72− addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
70+ #- env: BUILD=stack ARGS="--resolver lts-7"
71+ # compiler: ": #stack 8.0.1"
72+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
7373
74− - env: BUILD=stack ARGS="--resolver lts-8"
74+ - env: BUILD=stack ARGS="--resolver lts-9"
7575 compiler: ": #stack 8.0.2"
7676 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
7777
78+ - env: BUILD=stack ARGS="--resolver lts-10"
79+ compiler: ": #stack 8.2.2"
80+ addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
81+
7882 # Nightly builds are allowed to fail
7983 - env: BUILD=stack ARGS="--resolver nightly"
8084 compiler: ": #stack nightly"
8185 addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
8286
8387 # Build on OS X in addition to Linux
84− - env: BUILD=stack ARGS=""
85− compiler: ": #stack default osx"
86− os: osx
88+ #- env: BUILD=stack ARGS=""
89+ # compiler: ": #stack default osx"
90+ # os: osx
8791
8892 # Travis includes an OS X which is incompatible with GHC 7.8.4
8993 #- env: BUILD=stack ARGS="--resolver lts-2"
9094 # compiler: ": #stack 7.8.4 osx"
9195 # os: osx
9296
93− - env: BUILD=stack ARGS="--resolver lts-3"
94− compiler: ": #stack 7.10.2 osx"
95− os: osx
97+ #- env: BUILD=stack ARGS="--resolver lts-3"
98+ # compiler: ": #stack 7.10.2 osx"
99+ # os: osx
96100
97101 - env: BUILD=stack ARGS="--resolver lts-6"
98102 compiler: ": #stack 7.10.3 osx"
99103 os: osx
100104
101− - env: BUILD=stack ARGS="--resolver lts-7"
102− compiler: ": #stack 8.0.1 osx"
103− os: osx
105+ #- env: BUILD=stack ARGS="--resolver lts-7"
106+ # compiler: ": #stack 8.0.1 osx"
107+ # os: osx
104108
105− - env: BUILD=stack ARGS="--resolver lts-8"
109+ - env: BUILD=stack ARGS="--resolver lts-9"
106110 compiler: ": #stack 8.0.2 osx"
107111 os: osx
108112
113+ - env: BUILD=stack ARGS="--resolver lts-10"
114+ compiler: ": #stack 8.2.2 osx"
115+ os: osx
116+
109117 - env: BUILD=stack ARGS="--resolver nightly"
110118 compiler: ": #stack nightly osx"
111119 os: osx
@@ -158,7 +166,7 @@ install:
158166 # Avoid out of memory condition
159167 stack --no-terminal --install-ghc $ARGS build Cabal
160168
161− stack --no-terminal --install-ghc $ARGS test --bench --only-dependencies
169+ stack --no-terminal --install-ghc $ARGS test --only-dependencies
162170 ;;
163171 cabal)
164172 cabal --version
@@ -181,10 +189,10 @@ script:
181189 set -ex
182190 case "$BUILD" in
183191 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
185193 ;;
186194 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
188196
189197 ORIGDIR=$(pwd)
190198 for dir in $PACKAGES
stack.yaml+2−12
@@ -1,4 +1,4 @@
1−resolver: lts-4.1
1+resolver: lts-10.0
22packages:
33- ./auto-update
44- ./mime-types
@@ -14,18 +14,8 @@ flags:
1414 wai-extra:
1515 build-example: true
1616extra-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
2817- tls-session-manager-0.0.0.2
18+- psqueues-0.2.4.0
2919nix:
3020 enable: false
3121 packages:
warp/warp.cabal+4−1
@@ -173,7 +173,8 @@ Test-Suite spec
173173 , word8
174174 , hashable
175175 , http-date
176− , semigroups
176+ if impl(ghc < 8)
177+ Build-Depends: semigroups
177178
178179 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
179180 Cpp-Options: -DSENDFILEFD
@@ -196,6 +197,8 @@ Benchmark parser
196197 , network
197198 , network
198199 , unix-compat
200+ if impl(ghc < 8)
201+ Build-Depends: semigroups
199202
200203 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
201204 Cpp-Options: -DSENDFILEFD