Skip to content

Commit 7e2a0a6

Browse files
committed
Use separate stack.yaml for builds with older lts versions
Also: relax lower bounds for dependencies
1 parent 5a2c594 commit 7e2a0a6

File tree

5 files changed

+45
-22
lines changed

5 files changed

+45
-22
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ matrix:
9696
# compiler: ": #stack 8.0.2"
9797
# addons: {apt: {packages: [libgmp-dev]}}
9898

99-
- env: BUILD=stack ARGS="--resolver lts-11"
99+
- env: BUILD=stack ARGS="--resolver lts-11 --stack-yaml stack-8.2.2.yaml"
100100
compiler: ": #stack 8.2.2"
101101
addons: {apt: {packages: [libgmp-dev]}}
102102

103-
- env: BUILD=stack ARGS="--resolver lts-12"
103+
- env: BUILD=stack ARGS="--resolver lts-12 --stack-yaml stack-8.4.4.yaml"
104104
compiler: ": #stack 8.4.4"
105105
addons: {apt: {packages: [libgmp-dev]}}
106106

@@ -139,11 +139,11 @@ matrix:
139139
# compiler: ": #stack 8.0.2 osx"
140140
# os: osx
141141

142-
- env: BUILD=stack ARGS="--resolver lts-11"
142+
- env: BUILD=stack ARGS="--resolver lts-11 --stack-yaml stack-8.2.2.yaml"
143143
compiler: ": #stack 8.2.2 osx"
144144
os: osx
145145

146-
- env: BUILD=stack ARGS="--resolver lts-12"
146+
- env: BUILD=stack ARGS="--resolver lts-12 --stack-yaml stack-8.4.4.yaml"
147147
compiler: ": #stack 8.4.4 osx"
148148
os: osx
149149

kubernetes-client/package.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,35 @@ extra-source-files:
3636
dependencies:
3737
- base >=4.7 && <5.0
3838
- base64-bytestring
39-
- bytestring >=0.10.0 && <0.11
40-
- aeson >=1.2.2 && <1.5
41-
- attoparsec >=0.13.0.0 && <0.14
42-
- jsonpath >=0.1.0.0 && <0.2
43-
- connection >=0.2.8
44-
- containers >= 0.6.0.1
45-
- data-default-class >=0.1.2.0
39+
- bytestring >=0.10 && <0.11
40+
- aeson >=1.2 && <1.5
41+
- attoparsec >=0.13 && <0.14
42+
- jsonpath >=0.1 && <0.2
43+
- connection >=0.2
44+
- containers >= 0.5
45+
- data-default-class >=0.1
4646
- either
4747
- filepath
4848
- hoauth2
4949
- http-client >=0.5 && <0.7
50-
- http-client-tls >=0.3.5.3
50+
- http-client-tls >=0.3
5151
- jwt
5252
- kubernetes-client-core ==0.1.0.1
53-
- microlens >=0.4.3 && <0.5
54-
- mtl >=2.2.1
53+
- microlens >=0.4 && <0.5
54+
- mtl >=2.2
5555
- oidc-client
56-
- pem >=0.2.4
56+
- pem >=0.2
5757
- safe-exceptions >=0.1.0.0
5858
- stm
59-
- streaming-bytestring >= 0.1.5 && < 0.2.0
59+
- streaming-bytestring >= 0.1 && < 0.2.0
6060
- text >=0.11 && <1.3
6161
- time
6262
- timerep
6363
- tls >=1.4.1
6464
- typed-process
6565
- uri-bytestring
66-
- x509 >=1.7.5
67-
- x509-system >=1.6.6
68-
- x509-store >=1.6.7
69-
- x509-validation >=1.6.11
66+
- x509 >=1.7
67+
- x509-system >=1.6
68+
- x509-store >=1.6
69+
- x509-validation >=1.6
7070
- yaml

stack-8.2.2.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
resolver: lts-11
2+
extra-deps:
3+
- jsonpath-0.1.0.1
4+
- jwt-0.10.0
5+
- katip-0.8.0.0
6+
- hoauth2-1.8.8
7+
- aeson-1.4.4.0
8+
- git: https://github.com/akshaymankar/haskell-oidc-client
9+
commit: a8473ac96a6db919f789578a08adaa13a0a3e1d5
10+
packages:
11+
- kubernetes
12+
- kubernetes-client

stack-8.4.4.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
resolver: lts-12
2+
extra-deps:
3+
- jsonpath-0.1.0.1
4+
- jwt-0.10.0
5+
- katip-0.8.0.0
6+
- hoauth2-1.8.8
7+
- uri-bytestring-aeson-0.1.0.7
8+
- git: https://github.com/akshaymankar/haskell-oidc-client
9+
commit: a8473ac96a6db919f789578a08adaa13a0a3e1d5
10+
packages:
11+
- kubernetes
12+
- kubernetes-client

stack.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ extra-deps:
33
- jsonpath-0.1.0.1
44
- jwt-0.10.0
55
- katip-0.8.0.0
6-
- git: https://github.com/akshaymankar/haskell-oidc-client
7-
commit: a8473ac96a6db919f789578a08adaa13a0a3e1d5
6+
- oidc-client-0.4.0.0
87
packages:
98
- kubernetes
109
- kubernetes-client

0 commit comments

Comments
 (0)