From 66b8bb6da3e5bfb155a8306f8932aa666866891e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 17 Aug 2021 14:16:30 +0200
Subject: [PATCH] install helm before trying to fix potential cache errors

---
 .github/workflows/apps.release.yaml | 30 +++++++++++++++--------------
 .github/workflows/apps.test.yaml    | 28 +++++++++++++--------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/apps.release.yaml b/.github/workflows/apps.release.yaml
index 87519af20cf..2644b4a6377 100644
--- a/.github/workflows/apps.release.yaml
+++ b/.github/workflows/apps.release.yaml
@@ -53,13 +53,6 @@ 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:
@@ -73,6 +66,15 @@ jobs:
         uses: azure/setup-helm@v1
         with:
           version: v3.5.3
+
+
+      - 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: Checkout
         uses: actions/checkout@v2
         with:
@@ -180,13 +182,6 @@ 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:
@@ -210,6 +205,13 @@ jobs:
         with:
           version: v3.5.3
 
+      - 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: Run chart-releaser
         uses: helm/chart-releaser-action@v1.2.1
         with:
diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml
index 688362f1951..a1f8b3ed06b 100644
--- a/.github/workflows/apps.test.yaml
+++ b/.github/workflows/apps.test.yaml
@@ -97,13 +97,6 @@ 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
@@ -136,6 +129,13 @@ jobs:
         with:
           version: v3.5.3
 
+      - 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
+
       - uses: actions/setup-python@v2
         if: ${{ matrix.app != '.gitkee' }}
         with:
@@ -239,13 +239,6 @@ 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
@@ -271,6 +264,13 @@ jobs:
         with:
           version: v3.5.3
 
+      - 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: Remove if release already exists
         run: |
           removetask(){