From fb6df8463b7cf70d880b4eef4eb551ef23715e64 Mon Sep 17 00:00:00 2001
From: erlingrj <erling.jellum@gmail.com>
Date: Fri, 25 Oct 2024 14:39:21 -0700
Subject: [PATCH] Caching hell

---
 .github/actions/pico/action.yml   |  6 +++---
 .github/actions/zephyr/action.yml | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/pico/action.yml b/.github/actions/pico/action.yml
index 3e63d162..b1ff1f46 100644
--- a/.github/actions/pico/action.yml
+++ b/.github/actions/pico/action.yml
@@ -10,15 +10,15 @@ runs:
           gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
       shell: bash
 
-    - name: Cache SDK
-      id: cache-sdk
+    - name: Cache Pico SDK
+      id: cache-pico-sdk
       uses: actions/cache@v4
       with:
         path: /opt/pico-sdk
         key: pico-sdk-${{ runner.os }}
 
     - name: Install pico-sdk
-      if: steps.pico-sdk.outputs.cache-hit != 'true'
+      if: steps.cache-pico-sdk.outputs.cache-hit != 'true'
       run: | 
         git clone https://github.com/raspberrypi/pico-sdk /opt/pico-sdk
         echo "PICO_SDK_PATH=/opt/pico-sdk" >> $GITHUB_ENV 
diff --git a/.github/actions/zephyr/action.yml b/.github/actions/zephyr/action.yml
index 4743d121..fe3b249f 100644
--- a/.github/actions/zephyr/action.yml
+++ b/.github/actions/zephyr/action.yml
@@ -20,14 +20,14 @@ runs:
       shell: bash
 
     - name: Cache SDK
-      id: cache-sdk
+      id: cache-zephyr-sdk
       uses: actions/cache@v4
       with:
-        path: /opt/zephyr-sdk-${{env.SDK_VERSION}}_linux-x86_64
+        path: /opt/zephyr-sdk-${{env.SDK_VERSION}}
         key: zephyr-sdk-${{env.SDK_VERSION}}-${{ runner.os }}
 
     - name: Install Zephyr SDK
-      if: steps.cache-sdk.outputs.cache-hit != 'true'
+      if: steps.cache-zephyr-sdk.outputs.cache-hit != 'true'
       run : |
         wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{env.SDK_VERSION}}/zephyr-sdk-${{env.SDK_VERSION}}_linux-x86_64.tar.xz"
         wget -O - "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{env.SDK_VERSION}}/sha256.sum" | shasum --check --ignore-missing
@@ -37,14 +37,14 @@ runs:
       shell: bash
 
     - name: Cache Zephyr RTOS
-      id: cache-rtos
+      id: cache-zephyr-rtos
       uses: actions/cache@v4
       with:
         path: $HOME/lf-west-template
         key: lf-west-template-${{ runner.os }}
   
     - name: Download and install Zephyr RTOS with the lf-west-template
-      if: steps.cache-rtos.outputs.cache-hit != 'true'
+      if: steps.cache-zephyr-rtos.outputs.cache-hit != 'true'
       run: |
           cd $HOME
           git clone https://github.com/lf-lang/lf-west-template && cd lf-west-template