Skip to content

Commit

Permalink
Bump stack.yaml to GHC 9.6.3/lts-22.0
Browse files Browse the repository at this point in the history
Also preserves/updates stack-ghc-9.4.8.yaml, which may be useful for use of Stan in CI.

Also classifies Stack resolvers as `extra-source-files`.
  • Loading branch information
mpilgrem authored and tomjaguarpaw committed Dec 17, 2023
1 parent db09b6e commit 5ea9693
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ jobs:
run: |
cabal run stan
# As at 2023-10-15, the GitHub-hosted runner for ubuntu-latest comes with
# Stack 2.13.1 and GHC 9.6.3.
# As at 2023-12-16, the GitHub-hosted runner for ubuntu-latest comes with
# Stack 2.13.1 and GHC 9.8.1.
stack:
name: stack / ghc ${{ matrix.ghc }}
runs-on: ubuntu-latest
strategy:
matrix:
ghc: ["9.4.7"] # The version specified in the stack.yaml file
cache-bust: ["2023-10-15"]
ghc: ["9.6.3"] # The version specified in the stack.yaml file
cache-bust: ["2023-12-16"]

steps:
- name: Clone project
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cabal.project.local
.HTF/
# Stack
.stack-work/
stack.yaml.lock
*.yaml.lock
# HIE
.hie/

Expand Down
11 changes: 11 additions & 0 deletions stack-ghc-9.4.8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
resolver: lts-21.25 # GHC 9.4.8

extra-deps:
- clay-0.14.0@sha256:a50ba73137a39c55e89f24a7792107ec40ba07320b2c5ff7932049845c50ffc9,2204
- dir-traverse-0.2.3.0@sha256:adcc128f201ff95131b15ffe41365dc99c50dc3fa3a910f021521dc734013bfa,2137
- extensions-0.1.0.0@sha256:b8105dc43a57b0b3b54879e8dbb905676dfee3e8b59301fefbf2409a0fe95710,4447
- tomland-1.3.3.2@sha256:887dc39a8c9819deb8fcb6fde72e87dad4c94108b1736a5bf7215ccf3117bd0f,9474
- trial-0.0.0.0@sha256:ebd93f3485dd7f0ce8426fa46b500f26edbea285c2890150123e1b0f6a92c7db,4410
- trial-optparse-applicative-0.0.0.0@sha256:ee878dbf412849d4fb52d7bca93bec45a6392a93e03a46bd320109b9a0ff2a38,2540
- trial-tomland-0.0.0.0@sha256:c10c5c3f94e3dcfcad4a66cf70682ace77d5381596aff91fa2030636d07de977,2541
- validation-selective-0.2.0.0@sha256:e1ab5482dede8bf676d729a09109c7c5f798363b9d458e4197a27afb8b48fdd3,3907
15 changes: 8 additions & 7 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
resolver: lts-21.22 # GHC 9.4.8
resolver: lts-22.0 # GHC 9.6.3

extra-deps:
- clay-0.14.0@sha256:a50ba73137a39c55e89f24a7792107ec40ba07320b2c5ff7932049845c50ffc9,2204
- ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448
- dir-traverse-0.2.3.0@sha256:adcc128f201ff95131b15ffe41365dc99c50dc3fa3a910f021521dc734013bfa,2137
- extensions-0.1.0.0@sha256:b8105dc43a57b0b3b54879e8dbb905676dfee3e8b59301fefbf2409a0fe95710,4447
- tomland-1.3.3.2@sha256:d18682d9ad9014cc42a12bd122ae7834a950a052a122388995f33d6f349ff60d,9235
- trial-0.0.0.0@sha256:7946afde7134db6c5c35b7ab611018e2925e9c9fbb8c0fcf9831f3c7020928f1,4416
- trial-optparse-applicative-0.0.0.0@sha256:92548124f12c746bd30bb19c2e57b8a1bcad5824980f04a387efb0b1487c053c,2478
- trial-tomland-0.0.0.0@sha256:77f63a62660f94774375b2c1a1b28d25e4791d9bcad05e33dd7597cff0e75beb,2547
- extensions-0.1.0.1@sha256:f365d1da5ea1c60edd11334113ecd0d78eb12b4186b31151322ff7175a9adef7,5108
- optparse-applicative-0.17.1.0@sha256:cb5f5f0dc9749846fc0e3df0041a8efee6368cc1cff07336acd4c3b02a951ed6,5147
- tomland-1.3.3.2@sha256:887dc39a8c9819deb8fcb6fde72e87dad4c94108b1736a5bf7215ccf3117bd0f,9474
- trial-0.0.0.0@sha256:ebd93f3485dd7f0ce8426fa46b500f26edbea285c2890150123e1b0f6a92c7db,4410
- trial-optparse-applicative-0.0.0.0@sha256:ee878dbf412849d4fb52d7bca93bec45a6392a93e03a46bd320109b9a0ff2a38,2540
- trial-tomland-0.0.0.0@sha256:c10c5c3f94e3dcfcad4a66cf70682ace77d5381596aff91fa2030636d07de977,2541
- validation-selective-0.2.0.0@sha256:e1ab5482dede8bf676d729a09109c7c5f798363b9d458e4197a27afb8b48fdd3,3907
3 changes: 2 additions & 1 deletion stan.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ build-type: Simple
stability: experimental
extra-doc-files: README.md
CHANGELOG.md
stack.yaml
extra-source-files: test/.stan-example.toml
stack-ghc-9.4.8.yaml
stack.yaml
tested-with: GHC == 8.8.4
GHC == 8.10.7

Expand Down

0 comments on commit 5ea9693

Please sign in to comment.