From c597bf70b077a4211cfede64f9d1dffe4b907cd7 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 13:03:33 +1300
Subject: [PATCH] CI: Save iverilog cache in action

We still want to cache iverilog even if the rest of the action fails, so explicitly save/restore instead of standard cache.
---
 .github/actions/setup-build-env/action.yml |  2 +-
 .github/actions/setup-iverilog/action.yml  | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 6bf0afa15..6e46e1dfb 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -45,7 +45,7 @@ runs:
         echo "procs=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
 
     - name: Setup iverilog
-      if: inputs.get-iverilog
+      if: inputs.get-iverilog == 'true'
       uses: ./.github/actions/setup-iverilog
       with:
         runs-on: ${{ inputs.runs-on }}
diff --git a/.github/actions/setup-iverilog/action.yml b/.github/actions/setup-iverilog/action.yml
index 7f264a462..1517ad9c4 100644
--- a/.github/actions/setup-iverilog/action.yml
+++ b/.github/actions/setup-iverilog/action.yml
@@ -27,21 +27,20 @@ runs:
         make -j$procs
         make install
 
-    - name: Cache iverilog
-      id: cache-iverilog
-      uses: actions/cache@v4
+    - uses: actions/cache/restore@v4
+      id: restore-iverilog
       with:
         path: .local/
         key: ${{ inputs.runs-on }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
     - name: iverilog macOS deps
-      if: steps.cache-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
+      if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
       shell: bash
       run: |
         brew install autoconf
 
     - name: Build iverilog
-      if: steps.cache-iverilog.outputs.cache-hit != 'true'
+      if: steps.restore-iverilog.outputs.cache-hit != 'true'
       shell: bash
       run: |
         mkdir -p ${{ github.workspace }}/.local/
@@ -55,3 +54,10 @@ runs:
       shell: bash
       run: |
         iverilog -V
+
+    - uses: actions/cache/save@v4
+      id: save-iverilog
+      if: steps.restore-iverilog.outputs.cache-hit != 'true'
+      with:
+        path: .local/
+        key: ${{ steps.restore-iverilog.outputs.cache-primary-key }}