use ghWrapExpr in more places

Author: kostmo

src/HaskellCI/GitHub.hs

@@ -311,7 +311,11 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
                 Binary.put cfgGhcupJobs -- GHC location affects doctest, e.g
 
         when (doctestEnabled) $ githubUses "cache (tools)" "actions/cache/restore@v4"
-            [ ("key", "${{ runner.os }}-${{ matrix.compiler }}-tools-" ++ toolsConfigHash)
+            [ ("key", intercalate "-" [
+                  ghWrapExpr "runner.os"
+                , ghWrapExpr "matrix.compiler"
+                , "tools", toolsConfigHash
+                ])
             , ("path", "~/.haskell-ci-tools")
             ]
 
@@ -348,7 +352,12 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
             sh_if range "doctest --version"
 
         when (doctestEnabled) $ githubUsesIf "save cache (tools)" "actions/cache/save@v4" "always()"
-            [ ("key", "${{ runner.os }}-${{ matrix.compiler }}-tools-" ++ toolsConfigHash)
+            [ ("key", intercalate "-" [
+                  ghWrapExpr "runner.os"
+                , ghWrapExpr "matrix.compiler"
+                , "tools"
+                , toolsConfigHash
+                ])
             , ("path", "~/.haskell-ci-tools")
             ]
 
@@ -444,8 +453,16 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
         -- This a hack. https://github.com/actions/cache/issues/109
         -- Hashing Java - Maven style.
         githubUses "restore cache" "actions/cache/restore@v4"
-            [ ("key", "${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}")
-            , ("restore-keys", "${{ runner.os }}-${{ matrix.compiler }}-")
+            [ ("key", intercalate "-" [
+                  ghWrapExpr "runner.os"
+                , ghWrapExpr "matrix.compiler"
+                , ghWrapExpr "github.sha"
+                ])
+            , ("restore-keys", intercalate "-" [
+                  ghWrapExpr "runner.os"
+                , ghWrapExpr "matrix.compiler"
+                , ""
+                ]) -- Includes a trailing dash
             , ("path", "~/.cabal/store")
             ]
 
@@ -579,7 +596,11 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
                 sh_cs $ "$CABAL v2-haddock --disable-documentation" ++ haddockFlags ++ " $ARG_COMPILER " ++ withHaddock ++ " " ++ allFlags ++ " all"
 
         githubUsesIf "save cache" "actions/cache/save@v4" "always()"
-          [ ("key", "${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}")
+          [ ("key", intercalate "-" [
+                  ghWrapExpr "runner.os"
+                , ghWrapExpr "matrix.compiler"
+                , ghWrapExpr "github.sha"
+                ])
           , ("path", "~/.cabal/store")
           ]
 
@@ -591,7 +612,7 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
             }
         , ghJobs = Map.fromList $ buildList $ do
             item (mainJobName, GitHubJob
-                { ghjName            = actionName ++ " - Linux - ${{ matrix.compiler }}"
+                { ghjName            = intercalate " - " [actionName, "Linux", ghWrapExpr "matrix.compiler"]
                   -- NB: The Ubuntu version used in `runs-on` isn't
                   -- particularly important since we use a Docker container.
                 , ghjRunsOn          = ghcRunsOnVer