Merge pull request #18 from commercialhaskell/update-ci

Bump CI
commercialhaskell · Oct 7, 2023 · 2f0a307 · 2f0a307
2 parents 4797274 + 567665f
commit 2f0a307
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 347 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up HLint
       uses: haskell/actions/hlint-setup@v2
       with:
-        version: "3.5"
+        version: "3.6.1"
     - name: Apply HLint
       run: |
         set -ex

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,8 +7,8 @@ on:
     - master
   workflow_dispatch:
 
-# As of 7 April 2023, ubuntu-latest, windows-latest and macos-latest come with
-# Stack 2.9.3.
+# As of 7 October 2023, ubuntu-latest and windows-latest come with Stack 2.13.1.
+# macos-latest comes with Stack 2.9.3.
 
 jobs:
   tests:
@@ -21,13 +21,13 @@ jobs:
         - ubuntu-latest
         - windows-latest
         - macos-latest
-        stack-yaml:
+        resolver:
         - stack-ghc-8.8.4.yaml
         - stack-ghc-8.10.7.yaml
         - stack-ghc-9.0.2.yaml
-        - stack-ghc-9.2.7.yaml
-        - stack-ghc-9.4.5.yaml
-        - stack-ghc-9.6.1.yaml
+        - stack-ghc-9.2.8.yaml
+        - stack-ghc-9.4.7.yaml
+        - stack-ghc-9.6.3.yaml
     steps:
     - name: Clone project
       uses: actions/checkout@v3
@@ -36,18 +36,18 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ hashFiles( matrix.stack-yaml ) }}
+        key: ${{ runner.os }}-${{ hashFiles( matrix.resolver ) }}
     - name: Cache dependencies on Windows
       if: startsWith(runner.os, 'Windows')
       uses: actions/cache@v3
       with:
         path: |
           ~\AppData\Roaming\stack
           ~\AppData\Local\Programs\stack
-        key: ${{ runner.os }}-${{ hashFiles( matrix.stack-yaml ) }}
+        key: ${{ runner.os }}-${{ hashFiles( matrix.resolver ) }}
     - name: Test
       shell: bash
       run: |
         set -ex
-        stack --stack-yaml=${{ matrix.stack-yaml}} test --bench --only-dependencies
-        stack --stack-yaml=${{ matrix.stack-yaml}} test --haddock --no-haddock-deps --bench --no-run-benchmarks
+        stack --resolver=${{ matrix.resolver }} test --bench --only-dependencies
+        stack --resolver=${{ matrix.resolver }} test --haddock --no-haddock-deps --bench --no-run-benchmarks
diff --git a/stack-ghc-8.10.7.yaml.lock b/stack-ghc-8.10.7.yaml.lock
diff --git a/stack-ghc-8.6.5.yaml.lock b/stack-ghc-8.6.5.yaml.lock
diff --git a/stack-ghc-9.0.2.yaml.lock b/stack-ghc-9.0.2.yaml.lock
diff --git a/stack-ghc-9.2.7.yaml.lock b/stack-ghc-9.2.7.yaml.lock
diff --git a/stack-ghc-9.2.7.yaml → stack-ghc-9.2.8.yaml b/stack-ghc-9.2.7.yaml → stack-ghc-9.2.8.yaml
@@ -1,5 +1,5 @@
-# GHC 9.2.7
-resolver: lts-20.18
+# GHC 9.2.8
+resolver: lts-20.26
 
 flags:
   ansi-terminal:

diff --git a/stack-ghc-9.4.4.yaml b/stack-ghc-9.4.4.yaml
diff --git a/stack-ghc-9.4.4.yaml.lock b/stack-ghc-9.4.4.yaml.lock
diff --git a/stack-ghc-9.4.5.yaml.lock b/stack-ghc-9.4.5.yaml.lock
diff --git a/stack-ghc-9.4.5.yaml → stack-ghc-9.4.7.yaml b/stack-ghc-9.4.5.yaml → stack-ghc-9.4.7.yaml
@@ -1,5 +1,5 @@
 # GHC 9.4.5
-resolver: nightly-2023-04-25
+resolver: lts-21.7
 
 flags:
   ansi-terminal:

diff --git a/stack-ghc-9.6.1.yaml b/stack-ghc-9.6.1.yaml