Skip to content

Commit 3e69576

Browse files
committed
Switch to using explicit stack.yaml files in CI
1 parent a9ee8b4 commit 3e69576

File tree

6 files changed

+50
-21
lines changed

6 files changed

+50
-21
lines changed

.github/workflows/ci.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@ jobs:
2929
matrix:
3030
include:
3131
- ghc: "8.10.7"
32-
resolver: "lts-18.28"
33-
- ghc: "9.0.2"
34-
resolver: "lts-19.33"
32+
yaml: "stack-8.10.7.yaml"
33+
- ghc: "9.0.2 (aeson-1)"
34+
yaml: "stack-9.0.2-aeson1.yaml"
35+
- ghc: "9.0.2 (aeson-2)"
36+
yaml: "stack-9.0.2-aeson2.yaml"
3537
- ghc: "9.2.8"
36-
resolver: "lts-20.26"
38+
yaml: "stack-9.2.8.yaml"
3739
- ghc: "9.4.5"
38-
resolver: "lts-21.0"
40+
yaml: "stack.yaml"
3941
steps:
4042
- uses: actions/checkout@v3
4143

@@ -49,12 +51,12 @@ jobs:
4951
name: Cache ~/.stack
5052
with:
5153
path: ~/.stack
52-
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.resolver }}-stack2
54+
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.yaml }}-stack2
5355

5456
- name: Build
5557
run: |
56-
stack build --resolver ${{matrix.resolver}} --system-ghc --test --bench --no-run-tests --no-run-benchmarks
58+
stack build --stack-yaml ${{matrix.yaml}} --system-ghc --test --bench --no-run-tests --no-run-benchmarks
5759
5860
- name: Test
5961
run: |
60-
stack test --resolver ${{matrix.resolver}} --system-ghc
62+
stack test --stack-yaml ${{matrix.yaml}} --system-ghc

kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Text.Megaparsec ( Parsec, eof, runParser, some, takeWhile1P )
1717
import Text.Megaparsec.Char ( char )
1818
type Parser a = Parsec Void Text a
1919
#else
20-
import Data.Attoparsec.Text ( many1, char, takeWhile1, Parser )
20+
import Data.Attoparsec.Text ( Parser, char, endOfInput, many1, parseOnly, takeWhile1 )
2121
#endif
2222

2323

stack-9.0.2-aeson2.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
resolver: lts-19.7
2+
resolver: lts-19.33
33

44
extra-deps:
5-
- oidc-client-0.6.0.0@sha256:2079dc5c9dfb5b3e2fa93098254ca16787c01a0cd3634b1d84afe84c9a6c4825,3368
6-
- jose-jwt-0.9.4@sha256:6db77f81cfcf81cf7faf8a4dc4b2110c1603dbb94249d49d069a17b4897e9d69,3560
5+
- oidc-client-0.6.0.0
6+
- jose-jwt-0.9.5
77

88
packages:
99
- kubernetes

stack-9.0.2-aeson2.yaml.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ packages:
77
- completed:
88
hackage: oidc-client-0.6.0.0@sha256:2079dc5c9dfb5b3e2fa93098254ca16787c01a0cd3634b1d84afe84c9a6c4825,3368
99
pantry-tree:
10-
size: 1298
1110
sha256: c8dac64944a1e60d14958067e1992732effe723d60353690720c34b4d126af48
11+
size: 1298
1212
original:
13-
hackage: oidc-client-0.6.0.0@sha256:2079dc5c9dfb5b3e2fa93098254ca16787c01a0cd3634b1d84afe84c9a6c4825,3368
13+
hackage: oidc-client-0.6.0.0
1414
- completed:
15-
hackage: jose-jwt-0.9.4@sha256:6db77f81cfcf81cf7faf8a4dc4b2110c1603dbb94249d49d069a17b4897e9d69,3560
15+
hackage: jose-jwt-0.9.5@sha256:c02db1ef32e582330054d8befa412215afeeb597cb8756dadc75407ba776a159,3557
1616
pantry-tree:
17+
sha256: 778e69fddd33a43f9a2322d4404a27c3f7474295bbdad6f65325fe9c9fee3d86
1718
size: 1231
18-
sha256: fd3145cd8ab15be77d49522c454e86f17cf0f233ada7a623457926dbf6ea47e4
1919
original:
20-
hackage: jose-jwt-0.9.4@sha256:6db77f81cfcf81cf7faf8a4dc4b2110c1603dbb94249d49d069a17b4897e9d69,3560
20+
hackage: jose-jwt-0.9.5
2121
snapshots:
2222
- completed:
23-
size: 618884
24-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/7.yaml
25-
sha256: 57d4ce67cc097fea2058446927987bc1f7408890e3a6df0da74e5e318f051c20
26-
original: lts-19.7
23+
sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4
24+
size: 619204
25+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml
26+
original: lts-19.33

stack-9.2.8.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
resolver: lts-20.26
2+
3+
extra-deps:
4+
- oidc-client-0.7.0.1
5+
6+
packages:
7+
- kubernetes
8+
- kubernetes-client

stack-9.2.8.yaml.lock

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This file was autogenerated by Stack.
2+
# You should not edit this file by hand.
3+
# For more information, please see the documentation at:
4+
# https://docs.haskellstack.org/en/stable/lock_files
5+
6+
packages:
7+
- completed:
8+
hackage: oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382
9+
pantry-tree:
10+
sha256: 51cfcd6c170923db24ba297ac9937961f6b26e041ceec8ff09500e61017b433b
11+
size: 1298
12+
original:
13+
hackage: oidc-client-0.7.0.1
14+
snapshots:
15+
- completed:
16+
sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2
17+
size: 650475
18+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
19+
original: lts-20.26

0 commit comments

Comments
 (0)