From e2651b5d9bf23ec8d14e15cf5092e92f127d2f6e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 17 Aug 2021 12:58:53 +0200
Subject: [PATCH] restructure app-tests a bit more and fix postgresql

---
 .github/workflows/apps.test.yaml              | 39 +++++++++++++++----
 charts/stable/postgresql/Chart.yaml           |  2 +-
 .../upgrade-backup-postgres-hook.yaml         |  1 -
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml
index 0cd7b1cd67d..470859a3783 100644
--- a/.github/workflows/apps.test.yaml
+++ b/.github/workflows/apps.test.yaml
@@ -13,6 +13,29 @@ on:
       - '.github/ct-lint.yaml'
 
 jobs:
+  prephelm:
+    name: Get changed Apps
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.5.3
+
+      - name: Cache helm repo cache
+        uses: actions/cache@v2
+        with:
+          key: helmrepocache
+          path: |
+            ~/.cache/helm/repository
+            ~/.config/helm/repositories.yaml
+
+      - name: update helm repo cache
+        run: |
+          helm repo add truecharts https://truecharts.org
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+          helm repo update
+
   changes:
     name: Get changed Apps
     runs-on: ubuntu-20.04
@@ -48,7 +71,7 @@ jobs:
         fi
 
   app-tests:
-    needs: [changes]
+    needs: [changes, prephelm]
     if: ${{ needs.changes.outputs.empty_matrix == 'false' }}
     name: App Tests
     runs-on: ubuntu-latest
@@ -65,6 +88,14 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Cache helm repo cache
+        uses: actions/cache@v2
+        with:
+          key: helmrepocache
+          path: |
+            ~/.cache/helm/repository
+            ~/.config/helm/repositories.yaml
+
       - name: Prepare-Lint
         if: ${{ matrix.app != '.gitkee' }}
         id: prep-lint
@@ -220,12 +251,6 @@ jobs:
             ~/.cache/helm/repository
             ~/.config/helm/repositories.yaml
 
-      - name: update helm repo cache
-        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: |
           for train in stable incubator develop non-free deprecated
diff --git a/charts/stable/postgresql/Chart.yaml b/charts/stable/postgresql/Chart.yaml
index 167d50b64e4..50763faa64a 100644
--- a/charts/stable/postgresql/Chart.yaml
+++ b/charts/stable/postgresql/Chart.yaml
@@ -25,4 +25,4 @@ name: postgresql
 sources:
 - https://www.postgresql.org/
 type: application
-version: 1.0.11
+version: 1.0.12
diff --git a/charts/stable/postgresql/templates/upgrade-backup-postgres-hook.yaml b/charts/stable/postgresql/templates/upgrade-backup-postgres-hook.yaml
index a769336cbd7..516ee5180a6 100644
--- a/charts/stable/postgresql/templates/upgrade-backup-postgres-hook.yaml
+++ b/charts/stable/postgresql/templates/upgrade-backup-postgres-hook.yaml
@@ -54,4 +54,3 @@ spec:
       {{- end }}
 {{- end -}}
 {{- end -}}
-{{- end -}}