CI: add stack-9.8.yaml; bump others

agda · Dec 28, 2023 · 1aa2403 · 1aa2403
1 parent 972b27e
commit 1aa2403
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 24 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20231012
+# version: 0.17.20231112
 #
-# REGENDATA ("0.17.20231012",["github","fix-whitespace.cabal"])
+# REGENDATA ("0.17.20231112",["github","fix-whitespace.cabal"])
 #
 name: Haskell-CI
 on:
@@ -42,9 +42,9 @@ jobs:
             compilerVersion: 9.6.3
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.4.7
+          - compiler: ghc-9.4.8
             compilerKind: ghc
-            compilerVersion: 9.4.7
+            compilerVersion: 9.4.8
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.2.8
@@ -94,11 +94,10 @@ jobs:
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
-          "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -116,7 +115,7 @@ jobs:
           echo "HC=$HC" >> "$GITHUB_ENV"
           echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
           echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -79,13 +79,13 @@ jobs:
     needs: create_release
     strategy:
       matrix:
-        os: [ubuntu-22.04]
-        ghc-ver: ['9.6', '9.4', '9.2.8', '9.0.2', '8.10.7', '8.8.4', '8.6.5', '8.4.4']
+        os: [ubuntu-latest]
+        ghc-ver: ['9.8', '9.6', '9.4', '9.2.8', '9.0.2', '8.10.7', '8.8.4', '8.6.5', '8.4.4']
         include:
-          - os: windows-2022
-            ghc-ver: '9.6'
-          - os: macos-12
-            ghc-ver: '9.6'
+          - os: windows-latest
+            ghc-ver: '9.8'
+          - os: macos-latest
+            ghc-ver: '9.8'
       fail-fast: false
 
     env:
@@ -127,7 +127,7 @@ jobs:
         restore-keys: ${{ runner.os }}-stack-${{ env.STACK_VER }}-ghc-${{ matrix.ghc-ver }}-
 
     - name: Install dependencies
-      if: ${{ !steps.cache.outputs.cache-hit }}
+      if: ${{ steps.cache.outputs.cache-hit != 'true' }}
       run: |
         stack build ${ARGS} --only-dependencies
 
@@ -154,15 +154,15 @@ jobs:
     #   # Conditional to ensure this deployment is only run once per action.
     #   if: >-
     #     startsWith(github.ref, 'refs/tags/v')
-    #     && matrix.ghc-ver == '9.6'
+    #     && matrix.ghc-ver == '9.8'
     #   run: |
     #     DIST_TGZ=$(cabal sdist | tail -1)
     #     echo "DIST_TGZ=${DIST_TGZ}" >> "${GITHUB_ENV}"
 
     # - name: Source tarball release
     #   if: >-
     #     startsWith(github.ref, 'refs/tags/v')
-    #     && matrix.ghc-ver == '9.6'
+    #     && matrix.ghc-ver == '9.8'
     #   # uses: softprops/action-gh-release@v1
     #   # with:
     #   #   draft: true
@@ -183,7 +183,7 @@ jobs:
       if: >-
         startsWith(github.ref, 'refs/tags/v')
         && runner.os == 'Linux'
-        && matrix.ghc-ver == '9.6'
+        && matrix.ghc-ver == '9.8'
       run: |
         FIXW_BIN=fix-whitespace-${FIXW_VERSION}-linux.binary
         cp -p "${FIXW_EXE}" "${FIXW_BIN}"
@@ -194,7 +194,7 @@ jobs:
     #   if: >-
     #     startsWith(github.ref, 'refs/tags/v')
     #     && runner.os == 'Linux'
-    #     && matrix.ghc-ver == '9.6'
+    #     && matrix.ghc-ver == '9.8'
     #   # uses: softprops/action-gh-release@v1
     #   # with:
     #   #   draft: true
@@ -275,7 +275,7 @@ jobs:
     # - name: Upload binary
     #   if: >-
     #     startsWith(github.ref, 'refs/tags/v')
-    #     && (matrix.ghc-ver == '9.6' || runner.os != 'Linux')
+    #     && (matrix.ghc-ver == '9.8' || runner.os != 'Linux')
     #   uses: actions/upload-release-asset@v1
     #   env:
     #     GITHUB_TOKEN: ${{ github.token }}
@@ -288,7 +288,7 @@ jobs:
     - name: Upload binary
       if: >-
         startsWith(github.ref, 'refs/tags/v')
-        && (matrix.ghc-ver == '9.6' || runner.os != 'Linux')
+        && (matrix.ghc-ver == '9.8' || runner.os != 'Linux')
       env:
         GITHUB_TOKEN: ${{ github.token }}
       run: |

diff --git a/fix-whitespace.cabal b/fix-whitespace.cabal
@@ -18,7 +18,7 @@ tested-with:
   -- cabal-supported GHCs
   GHC == 9.8.1
   GHC == 9.6.3
-  GHC == 9.4.7
+  GHC == 9.4.8
   GHC == 9.2.8
   GHC == 9.0.2
   GHC == 8.10.7
@@ -33,6 +33,7 @@ extra-doc-files:
   README.md
   fix-whitespace.yaml
   -- stack-supported GHCs
+  stack-9.8.yaml
   stack-9.6.yaml
   stack-9.4.yaml
   stack-9.2.8.yaml

diff --git a/stack-9.4.yaml b/stack-9.4.yaml
@@ -1 +1 @@
-resolver: lts-21.15
+resolver: lts-21.25
diff --git a/stack-9.6.yaml b/stack-9.6.yaml
@@ -1 +1 @@
-resolver: nightly-2023-10-09
+resolver: lts-22.3
diff --git a/stack-9.8.yaml b/stack-9.8.yaml
@@ -0,0 +1 @@
+resolver: nightly-2023-12-28