Upgrade to GHC 9.8.1

tfausak · Nov 4, 2023 · e610f6c · e610f6c
1 parent 26fdfa2
commit e610f6c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git 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": "witch-${{ github.event.release.tag_name }}.tar.gz",
-            "file": "artifact/ubuntu-9.4.4/witch-${{ github.event.release.tag_name }}.tar.gz"
+            "file": "artifact/ubuntu-9.4.7/witch-${{ github.event.release.tag_name }}.tar.gz"
           }
         },
         {
-          "run": "cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.4/witch-${{ github.event.release.tag_name }}.tar.gz"
+          "run": "cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.7/witch-${{ github.event.release.tag_name }}.tar.gz"
         }
       ]
     }

diff --git 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/witch",
-        "cabal:/home/haskell/.cabal",
-        "cabal-store:/cabal-store"
+        "cabal-cache:/home/vscode/.cache/cabal",
+        "cabal-state:/home/vscode/.local/state/cabal"
       ],
       "working_dir": "/workspaces/witch"
     }
   },
   "volumes": {
-    "cabal": null,
-    "cabal-store": {
+    "cabal-cache": null,
+    "cabal-state": {
       "external": true
     }
   }

diff --git a/witch.cabal b/witch.cabal
@@ -23,11 +23,11 @@ flag pedantic
 
 common library
   build-depends:
-    , base >= 4.16.0 && < 4.19
+    , base >= 4.16.0 && < 4.20
     , bytestring >= 0.11.3 && < 0.12
     , containers >= 0.6.5 && < 0.7
     , tagged >= 0.8.6 && < 0.9
-    , text >= 1.2.5 && < 1.3 || >= 2.0 && < 2.1
+    , text >= 1.2.5 && < 1.3 || >= 2.0 && < 2.2
     , time >= 1.11.1 && < 1.13
   default-language: Haskell2010
   ghc-options:
@@ -49,6 +49,9 @@ common library
     ghc-options:
       -Werror
 
+  if impl(ghc >= 9.8)
+    ghc-options: -Wno-missing-role-annotations
+
 common executable
   import: library
 
@@ -61,7 +64,7 @@ library
   import: library
 
   build-depends:
-    , template-haskell >= 2.18 && < 2.21
+    , template-haskell >= 2.18 && < 2.22
   exposed-modules:
     Witch
     Witch.Encoding