Skip to content

Commit

Permalink
Bump stack.yaml to GHC 9.8.4/lts-23.0
Browse files Browse the repository at this point in the history
Also bumps old `stack.yaml` to lts-22.43 (the last for GHC 9.6.6) and preserves it, for people using Stack with GHC 9.6.6 and Stack in CI.

Also updates Stack project-level configuration files to use `snapshot` rather than legacy `resolver`.

Also bumps the Stack-related part of the CI.

Also bumps the non-Stack related part of the CI.
  • Loading branch information
mpilgrem authored and tomjaguarpaw committed Dec 9, 2024
1 parent 386a5ef commit 76e40f2
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
# See https://github.com/haskell/cabal/issues/10397
- "9.4.7"
- "9.4.8"
- "9.6.3"
- "9.8.1"
- "9.6.6"
- "9.8.2"
- "9.10.1"

exclude:
Expand Down Expand Up @@ -98,15 +98,15 @@ jobs:
run: |
cabal run stan
# As at 2024-07-10, the GitHub-hosted runner for ubuntu-latest comes with
# Stack 2.15.7 and GHC 9.10.1.
# As at 2024-12-09, the GitHub-hosted runner for ubuntu-latest comes with
# Stack 3.1.1 and GHC 9.10.1.
stack:
name: stack / ghc ${{ matrix.ghc }}
runs-on: ubuntu-latest
strategy:
matrix:
ghc: ["9.6.6"] # The version specified in the stack.yaml file
cache-bust: ["2024-07-10"]
ghc: ["9.8.4"] # The version specified in the stack.yaml file
cache-bust: ["2024-12-09"]

steps:
- name: Clone project
Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-9.4.8.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-21.25 # GHC 9.4.8
snapshot: lts-21.25 # GHC 9.4.8

extra-deps:
- clay-0.15.0@sha256:33a5b5d30186b03a32b66e9391e7ee9a213084643b583444038ba8f96223da78,2269
Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-9.6.3.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-22.6 # GHC 9.6.3
snapshot: lts-22.6 # GHC 9.6.3

extra-deps:
- ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448
Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-9.6.4.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-22.20 # GHC 9.6.4
snapshot: lts-22.20 # GHC 9.6.4

extra-deps:
- ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448
Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-9.6.5.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-22.27 # GHC 9.6.5
snapshot: lts-22.27 # GHC 9.6.5

extra-deps:
- ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448
Expand Down
12 changes: 12 additions & 0 deletions stack-ghc-9.6.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
snapshot: lts-22.43 # GHC 9.6.6

extra-deps:
- ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448
- dir-traverse-0.2.3.0@sha256:adcc128f201ff95131b15ffe41365dc99c50dc3fa3a910f021521dc734013bfa,2137
- extensions-0.1.0.1@sha256:131270f3dd3adfa96e48259a200b7303c4f8211f54bff168fb8020dfef2aaec7,5269
- optparse-applicative-0.17.1.0@sha256:cb5f5f0dc9749846fc0e3df0041a8efee6368cc1cff07336acd4c3b02a951ed6,5147
- tomland-1.3.3.3@sha256:877635f30fc7eeebc7b79283baeec1b7904365973cc3fd98c86f9d147eeef575,9147
- trial-0.0.0.0@sha256:eaefa22bf10b04a9149ef0231cfd5e42ff47534221d4cf4ad3d7653090c54d23,4410
- trial-optparse-applicative-0.0.0.0@sha256:3ca376f1361a3b623a52b8db8e178cdca5f2e6e3954d217b874a9af823ab6c06,2540
- trial-tomland-0.0.0.0@sha256:5dc32bd4003dc84565170e316576eb7a0c1cea3e8b8b3815d5f509b4a40577fd,2541
- validation-selective-0.2.0.0@sha256:cc847f1a110e3b1bd437a5356f115881b61cafcb11781b570b180efd88bf0907,3917
8 changes: 5 additions & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
resolver: lts-22.28 # GHC 9.6.6
snapshot: lts-23.0 # GHC 9.8.4

extra-deps:
- ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448
- ansi-terminal-1.0.2@sha256:1f90bb88e670ce63fbf2c9216d50857f2419582f1c6791e542c3eab97ecfd364,2897
- ansi-terminal-types-0.11.5@sha256:f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a,1482
- dir-traverse-0.2.3.0@sha256:adcc128f201ff95131b15ffe41365dc99c50dc3fa3a910f021521dc734013bfa,2137
- extensions-0.1.0.1@sha256:131270f3dd3adfa96e48259a200b7303c4f8211f54bff168fb8020dfef2aaec7,5269
- hedgehog-1.4@sha256:9860ab34ab3951d9515c71b777d8c9c47610aae7339933e17d26ad9a4afa5618,4754
- hspec-hedgehog-0.1.1.0
- optparse-applicative-0.17.1.0@sha256:cb5f5f0dc9749846fc0e3df0041a8efee6368cc1cff07336acd4c3b02a951ed6,5147
- tomland-1.3.3.3@sha256:877635f30fc7eeebc7b79283baeec1b7904365973cc3fd98c86f9d147eeef575,9147
- trial-0.0.0.0@sha256:eaefa22bf10b04a9149ef0231cfd5e42ff47534221d4cf4ad3d7653090c54d23,4410
- trial-optparse-applicative-0.0.0.0@sha256:3ca376f1361a3b623a52b8db8e178cdca5f2e6e3954d217b874a9af823ab6c06,2540
- trial-tomland-0.0.0.0@sha256:5dc32bd4003dc84565170e316576eb7a0c1cea3e8b8b3815d5f509b4a40577fd,2541
- validation-selective-0.2.0.0@sha256:cc847f1a110e3b1bd437a5356f115881b61cafcb11781b570b180efd88bf0907,3917
1 change: 1 addition & 0 deletions stan.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ extra-source-files: test/.stan-example.toml
stack-ghc-9.6.3.yaml
stack-ghc-9.6.4.yaml
stack-ghc-9.6.5.yaml
stack-ghc-9.6.6.yaml
stack.yaml
tested-with: GHC == 8.8.4
GHC == 8.10.7
Expand Down

0 comments on commit 76e40f2

Please sign in to comment.