workflow update from gha-workflows

Author: michaelwebb76

.github/workflows/haskell-ci.yml

@@ -1,5 +1,10 @@
 # This file is generated by `bellroy-github-actions`.
 # Think twice before editing it directly.
+env:
+  CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions
+  CABAL_VERSION: 3.14.2.0
+  GHCUP_VERSION: 0.1.50.2
+  LANGUAGE_EDITION: Haskell2010
 jobs:
   generate-matrix:
     name: Generate matrix from cabal
@@ -18,18 +23,16 @@ jobs:
   tests:
     container:
       image: buildpack-deps:jammy
+    env:
+      HCKIND: ghc
+      HCNAME: ghc-${{ matrix.ghc }}
+      HCVER: ${{ matrix.ghc }}
     name: ${{ matrix.ghc }} on ${{ matrix.os }}
     needs:
     - generate-matrix
     runs-on: ${{ matrix.os }}
     steps:
-    - env:
-        CABAL_VERSION: 3.14.2.0
-        GHCUP_VERSION: 0.1.50.2
-        HCKIND: ghc
-        HCNAME: ghc-${{ matrix.ghc }}
-        HCVER: ${{ matrix.ghc }}
-      name: apt
+    - name: apt
       run: |
         apt-get update
         apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
@@ -38,13 +41,7 @@ jobs:
         chmod a+x "$HOME/.ghcup/bin/ghcup"
         "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
         "$HOME/.ghcup/bin/ghcup" install cabal $CABAL_VERSION || (cat "$HOME"/.ghcup/logs/*.* && false)
-    - env:
-        CABAL_VERSION: 3.14.2.0
-        GHCUP_VERSION: 0.1.50.2
-        HCKIND: ghc
-        HCNAME: ghc-${{ matrix.ghc }}
-        HCVER: ${{ matrix.ghc }}
-      name: Set PATH and environment variables
+    - name: Set PATH and environment variables
       run: |
         echo "$HOME/.cabal/bin" >> $GITHUB_PATH
         echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
@@ -141,9 +138,7 @@ jobs:
       run: |
         mkdir -p unpacked
         find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
-    - env:
-        CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions
-      name: generate cabal.project
+    - name: generate cabal.project
       run: |
         PKGDIR_PROJECT="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*\/'$CABAL_FILE_RELATIVE_PATH_NO_EXTENSION'-[0-9.]*')"
         echo "PKGDIR_PROJECT=${PKGDIR_PROJECT}" >> "$GITHUB_ENV"
@@ -167,6 +162,7 @@ jobs:
       with:
         key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
         path: ~/.cabal/store
+        restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
     - name: install dependencies
       run: |
         $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
@@ -180,9 +176,7 @@ jobs:
     - name: tests
       run: |
         $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
-    - env:
-        LANGUAGE_EDITION: Haskell2010
-      name: doctest
+    - name: doctest
       run: |
         cd ${PKGDIR_PROJECT} || false
         doctest -X$LANGUAGE_EDITION src