Merge pull request #11 from andreasabel/ghc-9.8

Bump dependencies and CI for GHC 9.8
debug-ito · Mar 11, 2024 · 06ad505 · 06ad505
2 parents 707e973 + 5f5415d
commit 06ad505
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -18,12 +18,16 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         plan:
-          - ghc: '9.4.4'
-            resolver: 'nightly-2023-03-10'
+          - ghc: '9.8.2'
+            resolver: 'nightly-2024-03-08'
             allow-fail: false
             flags: ''
-          - ghc: '9.2.7'
-            resolver: 'lts-20.13'
+          - ghc: '9.6.4'
+            resolver: 'lts-22.12'
+          - ghc: '9.4.8'
+            resolver: 'lts-21.25'
+          - ghc: '9.2.8'
+            resolver: 'lts-20.26'
           - ghc: '9.0.2'
             resolver: 'lts-19.33'
           - ghc: '8.10.7'
@@ -36,8 +40,7 @@ jobs:
             resolver: 'lts-12.26'
           - ghc: '8.2.2'
             resolver: 'lts-11.22'
-          - ghc: '8.0.2'
-            resolver: 'lts-9.21'
+          # Stack 2.15 dropped support for GHC 8.0 and lower
 
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.plan.allow-fail == true }}
@@ -46,9 +49,9 @@ jobs:
       FLAGS: ${{ matrix.plan.flags }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: haskell/actions/setup@v2
+    - uses: haskell-actions/setup@v2
       id: cabal-setup-haskell
       with:
         ghc-version: ${{ matrix.plan.ghc }}
@@ -59,7 +62,7 @@ jobs:
         STACK_VERSION=$(stack --numeric-version)
         echo "STACK_VERSION=${STACK_VERSION}" >> "${GITHUB_ENV}"
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ~/.stack
         key: ${{ runner.os }}-stack-${{ env.STACK_VERSION }}-ghc-${{ matrix.plan.ghc }}-resolver-${{ matrix.plan.resolver }}
@@ -86,8 +89,9 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         plan:
-          - ghc: '9.6.1'
+          - ghc: '9.8'
             allow-fail: true
+          - ghc: '9.6'
           - ghc: '9.4'
           - ghc: '9.2'
           - ghc: '9.0'
@@ -102,21 +106,14 @@ jobs:
     continue-on-error: ${{ matrix.plan.allow-fail == true }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: haskell/actions/setup@v2
+    - uses: haskell-actions/setup@v2
       id: cabal-setup-haskell
       with:
         ghc-version: ${{ matrix.plan.ghc }}
         cabal-update: true
 
-    - name: Get GHC and cabal version
-      run: |
-        GHC_VERSION=$(ghc --numeric-version)
-        echo "GHC_VERSION=${GHC_VERSION}" >> "${GITHUB_ENV}"
-        CABAL_VERSION=$(cabal --numeric-version)
-        echo "CABAL_VERSION=${CABAL_VERSION}" >> "${GITHUB_ENV}"
-
     - name: Configure and freeze
       run: |
         set -ex
@@ -125,11 +122,13 @@ jobs:
         cabal v2-freeze
         test -f cabal.project.freeze
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
+      env:
+        key: ${{ runner.os }}-cabal-${{ steps.cabal-setup-haskell.outputs.cabal-version }}-ghc-${{ steps.cabal-setup-haskell.outputs.ghc-version }}
       with:
         path: ${{ steps.cabal-setup-haskell.outputs.cabal-store }}
-        key:          ${{ runner.os }}-cabal-${{ env.CABAL_VERSION }}-ghc-${{ env.GHC_VERSION }}-freeze-${{ hashFiles('cabal.project.freeze') }}
-        restore-keys: ${{ runner.os }}-cabal-${{ env.CABAL_VERSION }}-ghc-${{ env.GHC_VERSION }}-
+        key:          ${{ env.key }}-freeze-${{ hashFiles('cabal.project.freeze') }}
+        restore-keys: ${{ env.key }}-
 
     - name: Install dependencies
       run: cabal v2-build --only-dependencies all

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-dist
-dist-newstyle
+dist/
+dist-newstyle/
 cabal-dev
 *.o
 *.hi
@@ -11,3 +11,4 @@ cabal-dev
 cabal.sandbox.config
 .stack-work/
 cabal.project.local*
+stack*.yaml.lock
diff --git a/stack.yaml b/stack.yaml
@@ -1 +1 @@
-resolver: lts-20.14
+resolver: lts-21.25
diff --git a/staversion.cabal b/staversion.cabal
@@ -64,27 +64,27 @@ library
                         Staversion.Internal.HTTP,
                         Staversion.Internal.Megaparsec,
                         Staversion.Internal.EIO
-  build-depends:        base >=4.8 && <4.19,
+  build-depends:        base >=4.8 && <4.20,
                         unordered-containers >=0.2.3 && <0.3,
                         hashable >=1.2.6.1 && <1.5,
-                        aeson >=0.8.0 && <2.2,
-                        text >=0.11.3 && <2.1,
-                        bytestring >=0.10.0 && <0.12,
+                        aeson >=0.8.0 && <2.3,
+                        text >=0.11.3 && <2.2,
+                        bytestring >=0.10.0 && <0.13,
                         yaml >=0.8.3 && <0.12,
                         filepath >=1.3.0 && <1.5,
                         directory >=1.2.0 && <1.4,
-                        optparse-applicative >=0.11.0 && <0.18,
-                        containers >=0.5.5 && <0.7,
+                        optparse-applicative >=0.11.0 && <0.19,
+                        containers >=0.5.5 && <0.8,
                         http-client >=0.4.18 && <0.8,
                         http-client-tls >=0.2.2 && <0.4,
                         http-types >=0.8.6 && <0.13,
                         transformers >=0.3.0 && <0.7,
                         transformers-compat >=0.4.0 && <0.8,
-                        megaparsec >=4.2.0 && <9.4,
+                        megaparsec >=4.2.0 && <9.7,
                         semigroups >=0.18.0.1 && <0.21,
                         Cabal >=1.22.6.0 && <3.11,
                         pretty >=1.1.2.0 && <1.2,
-                        ansi-wl-pprint >=0.6.7.3 && <0.7,
+                        ansi-wl-pprint >=0.6.7.3 && <1.1,
                         process >=1.2.3.0 && <1.7
 
 executable staversion