Skip to content

Commit 1833a09

Browse files
committed
travis: Add Stack and GHC 8.8
1 parent fe136a6 commit 1833a09

8 files changed

+76
-38
lines changed

.gitignore

+20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
dist
2+
dist-*
3+
cabal-dev
14
*.o
25
*.hi
6+
*.hie
7+
*.chi
8+
*.chs.h
9+
*.dyn_o
10+
*.dyn_hi
11+
.hpc
12+
.hsenv
313
.cabal-sandbox
414
cabal.sandbox.config
515
connect-test
@@ -8,3 +18,13 @@ simple-proxy
818
testsuite
919
request-rewrite-proxy
1020
spellTmp.bak
21+
*.prof
22+
*.aux
23+
*.hp
24+
*.eventlog
25+
.stack-work/
26+
cabal.project.local
27+
cabal.project.local~
28+
.HTF/
29+
.ghc.environment.*
30+
*.yaml.lock

.travis.yml

+32-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
1-
sudo: required
2-
language: c
1+
---
2+
language: haskell
3+
cabal: "3.4"
34

45
os: linux
56
dist: xenial
67

7-
env:
8-
- GHCVER=8.0.2
9-
- GHCVER=8.2.2
10-
- GHCVER=8.4.4
11-
- GHCVER=8.6.4
8+
# Caching so the next build will be fast too.
9+
cache:
10+
directories:
11+
- $HOME/.stack
12+
- $TRAVIS_BUILD_DIR/.stack-work
1213

1314
before_install:
14-
- sudo add-apt-repository -y ppa:hvr/ghc
15-
- sudo apt-get update
16-
- sudo apt-get install cabal-install-1.24 ghc-$GHCVER
17-
- export PATH=/opt/cabal/bin:/opt/ghc/$GHCVER/bin:$PATH
15+
# Download and unpack the stack executable
16+
- mkdir -p ~/.local/bin
17+
- export PATH=$HOME/.local/bin:$PATH
18+
- >
19+
travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz
20+
| tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
21+
# Configure stack to use the system GHC installation
22+
- stack config set system-ghc --global true
1823

19-
install:
20-
- cabal-1.24 update
21-
- cabal-1.24 install --only-dependencies --enable-tests
22-
23-
script:
24-
- cabal-1.24 configure --enable-tests
25-
- cabal-1.24 build
26-
- dist/build/test/test
27-
- dist/build/test-io/test-io
28-
- cabal-1.24 haddock
29-
- cabal-1.24 sdist
24+
install: [cabal install --only-dependencies]
3025

26+
after_script:
27+
- cabal haddock
28+
- cabal sdist
29+
- stack --no-terminal test
3130

31+
jobs:
32+
include:
33+
- ghc: "8.0"
34+
env: STACK_YAML=stack-8.0.yaml
35+
- ghc: "8.2"
36+
env: STACK_YAML=stack-8.2.yaml
37+
- ghc: "8.4"
38+
env: STACK_YAML=stack-8.4.yaml
39+
- ghc: "8.6"
40+
env: STACK_YAML=stack-8.6.yaml
41+
- ghc: "8.8"

http-proxy.cabal

+15-15
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,27 @@ library
4040
Network.HTTP.Proxy.Request
4141

4242
build-depends: base >= 4 && < 5
43-
, async == 2.2.*
43+
, async >= 2.0.2 && < 2.3
4444
, blaze-builder == 0.4.*
4545
, bytestring == 0.10.*
46-
, bytestring-lexing == 0.5.*
46+
, bytestring-lexing >= 0.4.3.3 && < 0.6
4747
, case-insensitive == 1.2.*
48-
, conduit == 1.3.*
49-
, conduit-extra == 1.3.*
50-
, http-client == 0.6.*
51-
, http-conduit == 2.3.*
52-
, http-types == 0.12.*
53-
, mtl == 2.2.*
54-
, network == 2.8.*
55-
, resourcet == 1.2.*
56-
, streaming-commons == 0.2.*
57-
, tls == 1.4.*
48+
, conduit >= 1.2.5 && < 1.4
49+
, conduit-extra >= 1.1.9.1 && < 1.4
50+
, http-client >= 0.5.7.1 && < 0.7
51+
, http-conduit >= 2.2.4 && < 2.4
52+
, http-types >= 0.8.6 && < 0.13
53+
, mtl >= 2.1.3.1 && < 2.3
54+
, network >= 2.6.2.1 && < 3.2
55+
, resourcet >= 1.1.6 && < 1.3
56+
, streaming-commons >= 0.1.12.1 && < 0.3
57+
, tls >= 1.2.18 && < 1.6
5858
, text == 1.2.*
5959
, transformers == 0.5.*
60-
, wai == 3.2.*
60+
, wai >= 3.0.3.0 && < 3.3
6161
, wai-conduit == 3.0.*
62-
, warp == 3.2.*
63-
, warp-tls == 3.2.*
62+
, warp >= 3.0.13.1 && < 3.4
63+
, warp-tls >= 3.0.4.2 && < 3.3
6464

6565

6666

stack-8.0.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
resolver: lts-9.21

stack-8.2.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
resolver: lts-11.22

stack-8.4.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
resolver: lts-12.26

stack-8.6.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
resolver: lts-14.27

stack.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ flags: {}
22
packages:
33
- '.'
44
extra-deps: []
5-
resolver: lts-2.21
5+
resolver: lts-16.20

0 commit comments

Comments
 (0)