Upgrade to GHC 9.8.1 (#33)

* Upgrade to GHC 9.8.1 * Update devcontainer * Update devcontainer * Upgrade Cabal in CI
tfausak · Nov 4, 2023 · b846024 · b846024
1 parent 311af5e
commit b846024
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 36 deletions.
diff --git a/.devcontainer.json b/.devcontainer.json
diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml
@@ -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
+    }
+  }
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -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"
+}
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -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 }}"
           }
         },
@@ -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": "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"
         }
       ]
     }

diff --git a/compose.yaml b/compose.yaml
diff --git a/flow.cabal b/flow.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