Skip to content

Commit 3c43fcb

Browse files
authored
Merge pull request #175 from WillSewell/bump-ghc
Bump ghc version for nightly
2 parents 40c4f7d + 3569479 commit 3c43fcb

File tree

6 files changed

+161
-28
lines changed

6 files changed

+161
-28
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
strategy:
1212
fail-fast: false
1313
matrix:
@@ -21,20 +21,17 @@ jobs:
2121
- stack-nightly.yaml
2222

2323
steps:
24-
- name: 'https://github.com/mstksg/setup-stack/issues/13'
25-
run: 'echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV'
26-
2724
- name: Checkout
28-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2926

3027
- name: Setup stack
31-
uses: haskell/actions/setup@v2
28+
uses: haskell-actions/setup@v2
3229
with:
3330
enable-stack: true
3431
stack-version: latest
3532

3633
- name: Set up HLint
37-
uses: haskell/actions/hlint-setup@v2
34+
uses: haskell-actions/hlint-setup@v2
3835

3936
- name: Install dependencies
4037
run: stack --no-terminal --install-ghc test --only-dependencies
@@ -47,7 +44,7 @@ jobs:
4744
STACK_YAML: ${{ matrix.resolver-yaml }}
4845

4946
- name: HLint
50-
uses: haskell/actions/hlint-run@v2
47+
uses: haskell-actions/hlint-run@v2
5148
with:
5249
path: .
5350
fail-on: warning

pusher-http-haskell.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ library
4040
ghc-options: -Wcompat -Wmissing-signatures -Wall
4141
build-depends:
4242
aeson >=1.0 && <2.3,
43-
base >=4.11 && <4.20,
43+
base >=4.11 && <4.21,
4444
bytestring >=0.10 && <0.13,
4545
base16-bytestring >=0.1 && <1.1,
4646
crypton >=0.32 && <1.1,
@@ -50,7 +50,7 @@ library
5050
http-types >=0.8 && <0.13,
5151
memory >=0.7 && <0.19,
5252
text >=1.2 && < 2.2,
53-
time >=1.5 && <1.14,
53+
time >=1.5 && <1.15,
5454
unordered-containers ==0.2.*
5555

5656
test-suite tests

stack-nightly.yaml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,31 @@
11
packages:
22
- .
3-
resolver: nightly-2024-09-03
4-
compiler: ghc-9.8.2
3+
resolver: nightly-2024-10-31
4+
compiler: ghc-9.10.1
55
compiler-check: match-exact
6+
allow-newer: true
7+
flags:
8+
directory:
9+
os-string: true
10+
file-io:
11+
os-string: true
12+
unix:
13+
os-string: true
614
extra-deps:
7-
- hashable-1.5.0.0
15+
- array-0.5.8.0
16+
- base-4.20.0.1
17+
- binary-0.8.9.2
18+
- bytestring-0.12.1.0
19+
- containers-0.7
20+
- deepseq-1.5.1.0
21+
- directory-1.3.9.0
22+
- exceptions-0.10.9
23+
- filepath-1.5.3.0
24+
- mtl-2.3.1
25+
- parsec-3.1.17.0
26+
- process-1.6.25.0
27+
- stm-2.5.3.1
28+
- text-2.1.2
29+
- time-1.14
30+
- transformers-0.6.1.2
31+
- unix-2.8.5.1

stack-nightly.yaml.lock

Lines changed: 121 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,131 @@
11
# This file was autogenerated by Stack.
22
# You should not edit this file by hand.
33
# For more information, please see the documentation at:
4-
# https://docs.haskellstack.org/en/stable/topics/lock_files
4+
# https://docs.haskellstack.org/en/stable/lock_files
55

66
packages:
77
- completed:
8-
hackage: hashable-1.5.0.0@sha256:fc68b07d957ade5a0a0beadd560a8d093ceac30b2f35c85eed3bcf7889a25975,5833
8+
hackage: array-0.5.8.0@sha256:16f95533d2b46c45ad43e935c5ec04564717015ce9fe42151b3f523e5c5f1449,1634
99
pantry-tree:
10-
sha256: 603df10b52dd1130def3afeb518395eb0e40de2b6c33b649561fea24941e9c14
11-
size: 1578
10+
sha256: e34bba57c14bd1a00e81b8baa148d6e6caef567c73ba2dea398e377156d112b4
11+
size: 1135
1212
original:
13-
hackage: hashable-1.5.0.0
13+
hackage: array-0.5.8.0
14+
- completed:
15+
hackage: base-4.20.0.1@sha256:2921956349cb652a3102e032fde12b8148e3ce89b9440b40f740526ab1c64b24,9271
16+
pantry-tree:
17+
sha256: 73eddf076fdc3a27a417461cb711c468f1057ef3784a8a2d73fc0ac2ea463b2c
18+
size: 16874
19+
original:
20+
hackage: base-4.20.0.1
21+
- completed:
22+
hackage: binary-0.8.9.2@sha256:03381e511429c44d13990c6d76281c4fc2468371cede4fe684b0c98d9b7d5f5a,6611
23+
pantry-tree:
24+
sha256: 7fac13c81b45416bd082c34e31cc3ac19226dd15354f379156922ad4cfbe6285
25+
size: 1976
26+
original:
27+
hackage: binary-0.8.9.2
28+
- completed:
29+
hackage: bytestring-0.12.1.0@sha256:98e79e1c97117143e4012983509ec95f7e5e4f6adff6914d07812a39f83404b9,9473
30+
pantry-tree:
31+
sha256: 89aac3892a1f67b0b18fec87ac3eaf417b8698e5f231a25b571ac91d085943d3
32+
size: 4650
33+
original:
34+
hackage: bytestring-0.12.1.0
35+
- completed:
36+
hackage: containers-0.7@sha256:e9b5fdcc609159410d408c47e0be13663bb0b4a42a5183b52aa0ac9c99e1dfec,2668
37+
pantry-tree:
38+
sha256: 265b0a6110df990b5f9f04d21856333ed5ed66f37a4b0a0215901d831f69629b
39+
size: 2954
40+
original:
41+
hackage: containers-0.7
42+
- completed:
43+
hackage: deepseq-1.5.1.0@sha256:6adeff09469103c4e6cf94c2803d74ac1c652366250eacff97dea8415c3fb4ea,2214
44+
pantry-tree:
45+
sha256: 65d11b491ac27a9316e97eb298456261cef510249f28d6d9d8c88cf3c608a600
46+
size: 318
47+
original:
48+
hackage: deepseq-1.5.1.0
49+
- completed:
50+
hackage: directory-1.3.9.0@sha256:ae73d4c39d18842f57d48649f4583347823ef7b1bc0bde786ca39141f7fd8c87,3167
51+
pantry-tree:
52+
sha256: e8710b17eaf370c5ca0b650b37a2a2a0756af019043024a1442c078155a3ec9b
53+
size: 3386
54+
original:
55+
hackage: directory-1.3.9.0
56+
- completed:
57+
hackage: exceptions-0.10.9@sha256:6dc51893a998ee0db63852ccf7f47c04b5166a902086dc7ead1c9656c20245b4,2143
58+
pantry-tree:
59+
sha256: bf2c3cc7b523681a5d89323889002e08157c44d7127883ac89c8dfd24195bd95
60+
size: 738
61+
original:
62+
hackage: exceptions-0.10.9
63+
- completed:
64+
hackage: filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945
65+
pantry-tree:
66+
sha256: a5feb33f17ff131a5bba009abae35761594d62ba6873b2f70992a48db160c9b7
67+
size: 2274
68+
original:
69+
hackage: filepath-1.5.3.0
70+
- completed:
71+
hackage: mtl-2.3.1@sha256:5377696d7315e2ef31a8d15d67b22d733c20cac2caf8b26756ff8524c8217e6d,1868
72+
pantry-tree:
73+
sha256: ac3cf1dc9ef397512d4bf8f2c3fbe4d64fb8aabd253288b34bf86c09ae234d4f
74+
size: 1853
75+
original:
76+
hackage: mtl-2.3.1
77+
- completed:
78+
hackage: parsec-3.1.17.0@sha256:8407cbd428d7f640a0fff8891bd2f7aca13cebe70a5e654856f8abec9a648b56,5149
79+
pantry-tree:
80+
sha256: 0922d72bd7115bbb590757bd92a827021dfe745ed6c0cd22856f767bee83d91f
81+
size: 2810
82+
original:
83+
hackage: parsec-3.1.17.0
84+
- completed:
85+
hackage: process-1.6.25.0@sha256:9a0b2ef8096517fa0e0c7a5e9a5c2ae5744ed824c3331005f9408245810df345,2640
86+
pantry-tree:
87+
sha256: 9c7927cd4d7f2f4c64251256eb6904800b3922fa5c5424c60f0e08441693e12b
88+
size: 1790
89+
original:
90+
hackage: process-1.6.25.0
91+
- completed:
92+
hackage: stm-2.5.3.1@sha256:b93121e5fb0939cb7120322763079b425bab097e049abb35580ecb6ab6abccbe,2356
93+
pantry-tree:
94+
sha256: 7065b7b2d3dd010a394cc6aff541d6c006398182efc77b77a4764261f30422ab
95+
size: 1392
96+
original:
97+
hackage: stm-2.5.3.1
98+
- completed:
99+
hackage: text-2.1.2@sha256:69f99964f3918de098da01902a546547680e33dfdcd2513ab1df0ead62c7312a,10609
100+
pantry-tree:
101+
sha256: 99e804bb7aa4ce2d9f0cc08de08b41ac0451ab4bf991578de6c4cabf0b257c75
102+
size: 8647
103+
original:
104+
hackage: text-2.1.2
105+
- completed:
106+
hackage: time-1.14@sha256:918455e07f347049c2169a43169aca77de7a2c97e33aca0b476aabcd8a79798d,6989
107+
pantry-tree:
108+
sha256: 99f4567d90615077ca3d59b1eb19e748874ed99ade15b62449e4f02536c05308
109+
size: 7336
110+
original:
111+
hackage: time-1.14
112+
- completed:
113+
hackage: transformers-0.6.1.2@sha256:a7b171944b027eee6625531195cd6f8939394931df956af9e55b23e82aa66afe,3239
114+
pantry-tree:
115+
sha256: 1845c63354188a80dba513817d13d1fa2bee3c0431ae02a8666a286e68513786
116+
size: 2567
117+
original:
118+
hackage: transformers-0.6.1.2
119+
- completed:
120+
hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808
121+
pantry-tree:
122+
sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5
123+
size: 5821
124+
original:
125+
hackage: unix-2.8.5.1
14126
snapshots:
15127
- completed:
16-
sha256: 15aa39a9aef6b1b435914bdbd61c31a5bf382f8683979a549edc109a095eadaf
17-
size: 660735
18-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/9/3.yaml
19-
original: nightly-2024-09-03
128+
sha256: f42485a583f6c2e1d25341c8626af031df9f8dd15c05aba6051d145b7731cae4
129+
size: 673671
130+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/10/31.yaml
131+
original: nightly-2024-10-31

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packages:
22
- "."
3-
resolver: lts-22.33
3+
resolver: lts-22.39

stack.yaml.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# This file was autogenerated by Stack.
22
# You should not edit this file by hand.
33
# For more information, please see the documentation at:
4-
# https://docs.haskellstack.org/en/stable/topics/lock_files
4+
# https://docs.haskellstack.org/en/stable/lock_files
55

66
packages: []
77
snapshots:
88
- completed:
9-
sha256: 098936027eaa1ef14e2b8eb39d9933a973894bb70a68684a1bbf00730249879b
10-
size: 720001
11-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/33.yaml
12-
original: lts-22.33
9+
sha256: 6c5aeace2ca5ecde793a9e0acfaa730ec8f384aa2f6183a2a252f5f9ec55d623
10+
size: 720039
11+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/39.yaml
12+
original: lts-22.39

0 commit comments

Comments
 (0)