Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to GHC 9.8.1 #33

Merged
merged 4 commits into from
Nov 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .devcontainer.json

This file was deleted.

21 changes: 21 additions & 0 deletions .devcontainer/compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"services": {
"devcontainer": {
"command": "sh -exc 'sleep infinity'",
"image": "public.ecr.aws/acilearning/haskell:9.6.2",
"init": true,
"volumes": [
"..:/workspace",
"cabal-cache:/home/vscode/.cache/cabal",
"cabal-state:/home/vscode/.local/state/cabal"
],
"working_dir": "/workspace"
}
},
"volumes": {
"cabal-cache": null,
"cabal-state": {
"external": true
}
}
}
14 changes: 14 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"customizations": {
"vscode": {
"extensions": [
"taylorfausak.purple-yolk"
]
}
},
"dockerComposeFile": "compose.yaml",
"initializeCommand": "docker volume create cabal-state",
"postCreateCommand": "cabal update",
"service": "devcontainer",
"workspaceFolder": "/workspace"
}
21 changes: 13 additions & 8 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"id": "haskell",
"uses": "haskell/actions/setup@v2",
"with": {
"cabal-version": "3.8.1.0",
"cabal-version": "3.10.1.0",
"ghc-version": "${{ matrix.ghc }}"
}
},
Expand Down Expand Up @@ -82,28 +82,33 @@
"matrix": {
"include": [
{
"ghc": "9.4.4",
"ghc": "9.4.7",
"platform": "macos",
"version": "12"
},
{
"ghc": "9.2.7",
"ghc": "9.2.8",
"platform": "ubuntu",
"version": "22.04"
},
{
"ghc": "9.4.4",
"ghc": "9.4.7",
"platform": "ubuntu",
"version": "22.04"
},
{
"ghc": "9.6.1",
"ghc": "9.6.2",
"platform": "ubuntu",
"version": "22.04"
},
{
"ghc": "9.8.1",
"platform": "ubuntu",
"version": "22.04"
},
{
"extension": ".exe",
"ghc": "9.4.4",
"ghc": "9.4.7",
"platform": "windows",
"version": "2022"
}
Expand Down Expand Up @@ -167,11 +172,11 @@
"uses": "svenstaro/upload-release-action@v2",
"with": {
"asset_name": "flow-${{ github.event.release.tag_name }}.tar.gz",
"file": "artifact/ubuntu-9.4.4/flow-${{ github.event.release.tag_name }}.tar.gz"
"file": "artifact/ubuntu-9.4.7/flow-${{ github.event.release.tag_name }}.tar.gz"
}
},
{
"run": "cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.4/flow-${{ github.event.release.tag_name }}.tar.gz"
"run": "cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.7/flow-${{ github.event.release.tag_name }}.tar.gz"
}
]
}
Expand Down
21 changes: 0 additions & 21 deletions compose.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion flow.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ flag pedantic

common library
build-depends:
, base >= 4.16.0 && < 4.19
, base >= 4.16.0 && < 4.20
default-language: Haskell2010
ghc-options:
-Weverything
Expand Down
Loading