Skip to content

Commit b0c1f9a

Browse files
authored
Upgrade to GHC 9.8.1 (#30)
* Upgrade to GHC 9.8.1 * Allow newer text for optparse-generic * Allow newer text for burrito * Update devcontainer * Upgrade Cabal in CI
1 parent 7b9a7fe commit b0c1f9a

File tree

7 files changed

+55
-40
lines changed

7 files changed

+55
-40
lines changed

.devcontainer.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

.devcontainer/compose.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"services": {
3+
"devcontainer": {
4+
"command": "sh -exc 'sleep infinity'",
5+
"image": "public.ecr.aws/acilearning/haskell:9.6.2",
6+
"init": true,
7+
"volumes": [
8+
"..:/workspace",
9+
"cabal-cache:/home/vscode/.cache/cabal",
10+
"cabal-state:/home/vscode/.local/state/cabal"
11+
],
12+
"working_dir": "/workspace"
13+
}
14+
},
15+
"volumes": {
16+
"cabal-cache": null,
17+
"cabal-state": {
18+
"external": true
19+
}
20+
}
21+
}

.devcontainer/devcontainer.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"customizations": {
3+
"vscode": {
4+
"extensions": [
5+
"taylorfausak.purple-yolk"
6+
]
7+
}
8+
},
9+
"dockerComposeFile": "compose.yaml",
10+
"initializeCommand": "docker volume create cabal-state",
11+
"postCreateCommand": "cabal update",
12+
"service": "devcontainer",
13+
"workspaceFolder": "/workspace"
14+
}

.github/workflows/workflow.yaml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"id": "haskell",
2323
"uses": "haskell/actions/setup@v2",
2424
"with": {
25-
"cabal-version": "3.8.1.0",
25+
"cabal-version": "3.10.1.0",
2626
"ghc-version": "${{ matrix.ghc }}"
2727
}
2828
},
@@ -88,28 +88,33 @@
8888
"matrix": {
8989
"include": [
9090
{
91-
"ghc": "9.4.4",
91+
"ghc": "9.4.7",
9292
"platform": "macos",
9393
"version": "12"
9494
},
9595
{
96-
"ghc": "9.2.7",
96+
"ghc": "9.2.8",
9797
"platform": "ubuntu",
9898
"version": "22.04"
9999
},
100100
{
101-
"ghc": "9.4.4",
101+
"ghc": "9.4.7",
102102
"platform": "ubuntu",
103103
"version": "22.04"
104104
},
105105
{
106-
"ghc": "9.6.1",
106+
"ghc": "9.6.2",
107+
"platform": "ubuntu",
108+
"version": "22.04"
109+
},
110+
{
111+
"ghc": "9.8.1",
107112
"platform": "ubuntu",
108113
"version": "22.04"
109114
},
110115
{
111116
"extension": ".exe",
112-
"ghc": "9.4.4",
117+
"ghc": "9.4.7",
113118
"platform": "windows",
114119
"version": "2022"
115120
}
@@ -173,36 +178,36 @@
173178
"uses": "svenstaro/upload-release-action@v2",
174179
"with": {
175180
"asset_name": "github-release-${{ github.event.release.tag_name }}-ubuntu",
176-
"file": "artifact/ubuntu-9.4.4/github-release",
181+
"file": "artifact/ubuntu-9.4.7/github-release",
177182
"tag": "${{ github.event.release.tag_name }}"
178183
}
179184
},
180185
{
181186
"uses": "svenstaro/upload-release-action@v2",
182187
"with": {
183188
"asset_name": "github-release-${{ github.event.release.tag_name }}-macos",
184-
"file": "artifact/macos-9.4.4/github-release",
189+
"file": "artifact/macos-9.4.7/github-release",
185190
"tag": "${{ github.event.release.tag_name }}"
186191
}
187192
},
188193
{
189194
"uses": "svenstaro/upload-release-action@v2",
190195
"with": {
191196
"asset_name": "github-release-${{ github.event.release.tag_name }}-windows.exe",
192-
"file": "artifact/windows-9.4.4/github-release.exe",
197+
"file": "artifact/windows-9.4.7/github-release.exe",
193198
"tag": "${{ github.event.release.tag_name }}"
194199
}
195200
},
196201
{
197202
"uses": "svenstaro/upload-release-action@v2",
198203
"with": {
199204
"asset_name": "github-release-${{ github.event.release.tag_name }}.tar.gz",
200-
"file": "artifact/ubuntu-9.4.4/github-release-${{ github.event.release.tag_name }}.tar.gz",
205+
"file": "artifact/ubuntu-9.4.7/github-release-${{ github.event.release.tag_name }}.tar.gz",
201206
"tag": "${{ github.event.release.tag_name }}"
202207
}
203208
},
204209
{
205-
"run": "cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.4/github-release-${{ github.event.release.tag_name }}.tar.gz"
210+
"run": "cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.7/github-release-${{ github.event.release.tag_name }}.tar.gz"
206211
}
207212
]
208213
}

cabal.project

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ allow-newer:
44
-- https://github.com/tfausak/burrito/pull/23
55
, burrito:base
66
, burrito:template-haskell
7+
, burrito:text
78
, burrito:transformers
9+
, optparse-generic:text

compose.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

github-release.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ flag pedantic
2525
common library
2626
build-depends:
2727
, aeson >= 2.0.3 && < 2.3
28-
, base >= 4.16.0 && < 4.19
28+
, base >= 4.16.0 && < 4.20
2929
, burrito >= 1.2.0 && < 1.3 || >= 2.0.0 && < 2.1
3030
, bytestring >= 0.11.3 && < 0.12
3131
, http-client >= 0.7.13 && < 0.8
3232
, http-client-tls >= 0.3.6 && < 0.4
3333
, http-types >= 0.12.3 && < 0.13
3434
, mime-types >= 0.1.0 && < 0.2
3535
, optparse-generic >= 1.4.8 && < 1.6
36-
, text >= 1.2.5 && < 1.3 || >= 2.0 && < 2.1
36+
, text >= 1.2.5 && < 1.3 || >= 2.0 && < 2.2
3737
, unordered-containers >= 0.2.17 && < 0.3
3838
default-language: Haskell2010
3939
ghc-options:

0 commit comments

Comments
 (0)