From 5d4590232f73525461cdccb4c192410238aa8adc Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 17 Aug 2021 14:10:04 +0200
Subject: [PATCH] fix some cache issues

---
 .github/workflows/apps.release.yaml | 49 ++++++++++++++++++++---------
 .github/workflows/apps.test.yaml    | 17 ++++++++++
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/apps.release.yaml b/.github/workflows/apps.release.yaml
index 55a0ad1e3e4..87519af20cf 100644
--- a/.github/workflows/apps.release.yaml
+++ b/.github/workflows/apps.release.yaml
@@ -44,6 +44,22 @@ jobs:
     container:
       image: ixsystems/catalog_validation:latest
     steps:
+      - name: Cache helm repo cache
+        id: cache
+        uses: actions/cache@v2
+        with:
+          key: helmrepocache-${{ github.sha }}
+          path: |
+            ~/.cache/helm/repository
+            ~/.config/helm/repositories.yaml
+
+      - name: Cache-Error-Fix
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          helm repo add truecharts https://truecharts.org
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+          helm repo update
+
       - name: Block concurrent jobs
         uses: softprops/turnstyle@v1
         with:
@@ -52,13 +68,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
       - uses: actions/checkout@v2
         name: Checkout
-      - name: Cache helm repo cache
-        uses: actions/cache@v2
-        with:
-          key: helmrepocache-${{ github.sha }}
-          path: |
-            ~/.cache/helm/repository
-            ~/.config/helm/repositories.yaml
+
       - name: Install Helm
         uses: azure/setup-helm@v1
         with:
@@ -160,6 +170,23 @@ jobs:
     needs: [prephelm]
     runs-on: ubuntu-latest
     steps:
+
+      - name: Cache helm repo cache
+        id: cache
+        uses: actions/cache@v2
+        with:
+          key: helmrepocache-${{ github.sha }}
+          path: |
+            ~/.cache/helm/repository
+            ~/.config/helm/repositories.yaml
+
+      - name: Cache-Error-Fix
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          helm repo add truecharts https://truecharts.org
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+          helm repo update
+
       - name: Block concurrent jobs
         uses: softprops/turnstyle@v1
         with:
@@ -173,14 +200,6 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.BOT_TOKEN }}
 
-      - name: Cache helm repo cache
-        uses: actions/cache@v2
-        with:
-          key: helmrepocache-${{ github.sha }}
-          path: |
-            ~/.cache/helm/repository
-            ~/.config/helm/repositories.yaml
-
       - name: Configure Git
         run: |
           git config user.name "TrueCharts-Bot"
diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml
index 1dfdffabc6c..688362f1951 100644
--- a/.github/workflows/apps.test.yaml
+++ b/.github/workflows/apps.test.yaml
@@ -89,6 +89,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache helm repo cache
+        id: cache
         uses: actions/cache@v2
         with:
           key: helmrepocache-${{ github.sha }}
@@ -96,6 +97,13 @@ jobs:
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
 
+      - name: Cache-Error-Fix
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          helm repo add truecharts https://truecharts.org
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+          helm repo update
+
       - name: Prepare-Lint
         if: ${{ matrix.app != '.gitkee' }}
         id: prep-lint
@@ -223,6 +231,7 @@ jobs:
       image: ixsystems/catalog_validation:latest
     steps:
       - name: Cache helm repo cache
+        id: cache
         uses: actions/cache@v2
         with:
           key: helmrepocache-${{ github.sha }}
@@ -230,6 +239,14 @@ jobs:
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
 
+      - name: Cache-Error-Fix
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          helm repo add truecharts https://truecharts.org
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+          helm repo update
+
+
       - name: Block concurrent jobs
         uses: softprops/turnstyle@v1
         with: