From f87d958492901fadf022a1e35d117d27ee71dcb3 Mon Sep 17 00:00:00 2001
From: Edmund Noble <edmundnoble@gmail.com>
Date: Tue, 14 Jan 2025 15:26:55 -0500
Subject: [PATCH] Try caching ghcup in CI

This might avoid having to really use ghcup to install ghc and cabal.

Change-Id: Id000000006ec5f91636e503bb15f4ebeef74690d

Merge commit
---
 .github/workflows/applications.yml | 50 +++++++++++++++++++++++-------
 .github/workflows/macos.yaml       |  5 ++-
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml
index 32f5c9b993..29ec019e9c 100644
--- a/.github/workflows/applications.yml
+++ b/.github/workflows/applications.yml
@@ -135,7 +135,7 @@ jobs:
         MATRIX="$(jq -c '.' <<EOF
         {
           # The first version in this list is the version to be used for release
-          "ghc": ["9.8.2", "9.10.1", "9.6.6"],
+          "ghc": ["9.10.1", "9.6.6"],
           "cabal": ["3.12"],
           "os": ["ubuntu-22.04"],
           "use-freeze-file": ["false"],
@@ -153,7 +153,7 @@ jobs:
         else
         MATRIX="$(jq -c '.' <<EOF
         {
-          "ghc": ["9.8.2", "9.10.1", "9.6.6"],
+          "ghc": ["9.10.1", "9.6.6"],
           "cabal": ["3.12"],
           "os": ["ubuntu-22.04"],
           "use-freeze-file": ["false"],
@@ -247,9 +247,29 @@ jobs:
     #     done
 
     # work around for https://github.com/haskell/actions/issues/187
-    - name: Set permissions for .ghcup
-      if: startsWith(matrix.os, 'ubuntu-')
-      run: sudo chown -R $USER /usr/local/.ghcup
+    - uses: actions/cache/restore@v4
+      name: Restore ghc & cabal binaries cache
+      id: ghc-cabal-cache
+      env:
+        key: ${{ runner.os }}-ghc-cabal
+      with:
+        path: |
+          /home/runner/.ghcup
+        key: ${{ env.key }}-${{ matrix.os }}-${{ matrix.ghc }}-${{ hashFiles('bin/cabal', 'bin/ghc') }}
+        restore-keys: ${{ env.key }}-${{ matrix.os }}-${{ matrix.ghc }}-
+
+    - uses: actions/cache/restore@v4
+      name: Restore dist-newstyle cache
+      id: cabal-dist-cache
+      with:
+        path: |
+          ~/.cabal/packages
+          ~/.cabal/store
+          dist-newstyle
+        key: ${{ matrix.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.*', '*.cabal', 'src/**', 'test/**') }}
+        restore-keys: |
+          ${{ matrix.os }}-${{ matrix.ghc }}-
+
     - name: Install GHC and Cabal
       id: setup
       uses: haskell-actions/setup@v2
@@ -261,8 +281,19 @@ jobs:
         echo "setup ghc-version: ${{ steps.setup.outputs.ghc-version }}"
         echo "setup cabal-version: ${{ steps.setup.outputs.cabal-version }}"
         echo "setup cabal-store: ${{ steps.setup.outputs.cabal-store }}"
+        which ghc
         ghc --version
+        which cabal
         cabal --version
+
+    - uses: actions/cache/save@v4
+      name: Cache ghc & cabal binaries
+      if: steps.ghc-cabal-cache.outputs.cache-hit != 'true'
+      with:
+        path: |
+          /home/runner/.ghcup
+        key: ${{ env.key }}-${{ matrix.os }}-${{ matrix.ghc }}-${{ hashFiles('bin/cabal', 'bin/ghc') }}
+
     - name: Install non-Haskell dependencies (ubuntu)
       if: contains(matrix.os, 'ubuntu')
       run: sudo apt-get install -y libgflags-dev liblz4-dev libzstd-dev libsnappy-dev libbz2-dev libmpfr-dev
@@ -317,15 +348,12 @@ jobs:
     # dist cache
     # the cache-key forces uploading of cache at least once a day, which ensures that
     # upstream dependency changes are captured regularly.
-    - uses: actions/cache@v4
-      name: Cache dist-newstyle
+    - uses: actions/cache/save@v4
+      name: Save dist-newstyle cache
       with:
         path: |
           dist-newstyle
-        key: ${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.use-freeze-file }}-2-${{ hashFiles('cabal.*', '*.cabal', 'src/**', 'test/**') }}
-        restore-keys: |
-          ${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.use-freeze-file }}-2-
-          ${{ matrix.os }}-${{ matrix.ghc }}-
+        key: ${{ steps.cabal-dist-cache.outputs.cache-primary-key }}
 
     # Build
     - name: Delete Freeze file if it exists
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index 17b8da7873..5e0ac82d50 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -32,7 +32,7 @@ jobs:
         key: ${{ runner.os }}-${{ runner.arch }}-ghc-cabal
       with:
         path: |
-          /Users/runner/.ghcup
+          /home/runner/.ghcup
         key: ${{ env.key }}-${{ hashFiles('bin/cabal', 'bin/ghc') }}
         restore-keys: ${{ env.key }}-
 
@@ -71,7 +71,7 @@ jobs:
       if: steps.ghc-cabal-cache.outputs.cache-hit != 'true'
       with:
         path: |
-          /Users/runner/.ghcup
+          /home/runner/.ghcup
         key: ${{ steps.ghc-cabal-cache.outputs.cache-primary-key }}
 
     - name: Install non-Haskell dependencies (macOS)
@@ -171,4 +171,3 @@ jobs:
           exit 1
         fi
         mv cabal.project.freeze.backup cabal.project.freeze
-