diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 202523e..5068a09 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -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" } @@ -167,11 +172,11 @@ "uses": "svenstaro/upload-release-action@v2", "with": { "asset_name": "rampart-${{ github.event.release.tag_name }}.tar.gz", - "file": "artifact/ubuntu-9.4.4/rampart-${{ github.event.release.tag_name }}.tar.gz" + "file": "artifact/ubuntu-9.4.7/rampart-${{ github.event.release.tag_name }}.tar.gz" } }, { - "run": "cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.4/rampart-${{ github.event.release.tag_name }}.tar.gz" + "run": "cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.7/rampart-${{ github.event.release.tag_name }}.tar.gz" } ] } diff --git a/compose.yaml b/compose.yaml index 1db9615..5438a38 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,20 +1,20 @@ { "services": { "devcontainer": { - "command": "sh -c 'while sleep 1; do :; done'", - "image": "public.ecr.aws/acilearning/haskell:9.4.4", + "command": "sh -exc 'sleep infinity'", + "image": "public.ecr.aws/acilearning/haskell:9.4.7", "init": true, "volumes": [ ".:/workspaces/rampart", - "cabal:/home/haskell/.cabal", - "cabal-store:/cabal-store" + "cabal-cache:/home/vscode/.cache/cabal", + "cabal-state:/home/vscode/.local/state/cabal" ], "working_dir": "/workspaces/rampart" } }, "volumes": { - "cabal": null, - "cabal-store": { + "cabal-cache": null, + "cabal-state": { "external": true } } diff --git a/rampart.cabal b/rampart.cabal index fca1930..cde650c 100644 --- a/rampart.cabal +++ b/rampart.cabal @@ -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 @@ -41,6 +41,9 @@ common library if flag(pedantic) ghc-options: -Werror + if impl(ghc >= 9.8) + ghc-options: -Wno-missing-role-annotations + common executable import: library