From 9cc29a832ed7021f9f6c27ece6fa48899d29d777 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:11:00 +0000
Subject: [PATCH] ci: use `actions/cache` to manage depends cache

Co-authored-by: pasta <pasta@dashboost.org>
---
 .github/workflows/build.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 197426c657..7b9dbd8020 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,25 +86,20 @@ jobs:
           restore-keys: |
             depends-sources-
 
-      - name: Cache dependencies
+      - name: Cache depends
         uses: actions/cache@v4
         with:
           path: |
             depends/built
+            depends/${{ matrix.host }}
           key: ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
           restore-keys: |
             ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
             ${{ runner.os }}-depends-${{ matrix.build_target }}
 
-      - name: Build dependencies
+      - name: Build depends
         run: make -j$(nproc) -C depends HOST=${{ matrix.host }}
 
-      - name: Upload built depends
-        uses: actions/upload-artifact@v4
-        with:
-          name: depends-${{ matrix.build_target }}
-          path: depends/${{ matrix.host }}
-
   build:
     name: Build
     needs: [build-image, build-depends]
@@ -146,11 +141,13 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Download built depends
-        uses: actions/download-artifact@v4
+      - name: Restore depends cache
+        uses: actions/cache/restore@v4
         with:
-          name: depends-${{ matrix.depends_on }}
-          path: depends/${{ matrix.host }}
+          path: |
+            depends/built
+            depends/${{ matrix.host }}
+          key: ${{ runner.os }}-depends-${{ matrix.depends_on }}-${{ hashFiles('depends/packages/*') }}
 
       - name: Determine PR Base SHA
         id: vars