From 4fad7de228097b3e7ec81aa68fd0d71c98f26f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=E1=B4=87=CA=80=C9=B4=E1=B4=85=20S=E1=B4=84=CA=9C?=
 =?UTF-8?q?=E1=B4=8F=CA=80=C9=A2=E1=B4=87=CA=80s?= <me@bjw-s.dev>
Date: Wed, 27 Jul 2022 08:08:04 +0200
Subject: [PATCH] =?UTF-8?q?ci:=20=F0=9F=A7=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/collect-changes/action.yaml | 44 +++++++++++++--------
 .github/workflows/pr-validate.yaml          | 30 +++++++-------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/.github/actions/collect-changes/action.yaml b/.github/actions/collect-changes/action.yaml
index 7f53c79d..f04dd38b 100644
--- a/.github/actions/collect-changes/action.yaml
+++ b/.github/actions/collect-changes/action.yaml
@@ -10,7 +10,7 @@ outputs:
     value: ${{ steps.filter.outputs.addedOrModified_files }}
   addedOrModifiedCharts:
     description: "A list of the charts changed"
-    value: ${{ steps.filter-charts.outputs.addedOrModified }}
+    value: ${{ steps.filter-charts.outputs.addedOrModifiedCharts }}
 
 runs:
   using: "composite"
@@ -24,22 +24,34 @@ runs:
           addedOrModified:
             - added|modified: 'charts/*/**'
 
+    # - name: Collect changed charts
+    #   if: |
+    #     steps.filter.outputs.addedOrModified == 'true'
+    #   id: filter-charts
+    #   shell: bash
+    #   run: |
+    #     CHARTS=()
+    #     PATHS=(${{ steps.filter.outputs.addedOrModified_files }})
+    #     # Get only the chart paths
+    #     for CHARTPATH in "${PATHS[@]}"
+    #     do
+    #       IFS='/' read -r -a path_parts <<< "${CHARTPATH}"
+    #       CHARTS+=("${path_parts[1]}/${path_parts[2]}")
+    #     done
+
+    #     # Remove duplicates
+    #     CHARTS=( `printf "%s\n" "${CHARTS[@]}" | sort -u` )
+    #     # Set output to changed charts
+    #     printf "::set-output name=addedOrModifiedCharts::%s\n" "${CHARTS[*]}"
+
+    - name: Set up chart-testing
+      uses: helm/chart-testing-action@v2.2.1
+
     - name: Collect changed charts
-      if: |
-        steps.filter.outputs.addedOrModified == 'true'
-      id: filter-charts
+      id: changed-charts
       shell: bash
       run: |
-        CHARTS=()
-        PATHS=(${{ steps.filter.outputs.addedOrModified_files }})
-        # Get only the chart paths
-        for CHARTPATH in "${PATHS[@]}"
-        do
-          IFS='/' read -r -a path_parts <<< "${CHARTPATH}"
-          CHARTS+=("${path_parts[1]}/${path_parts[2]}")
-        done
-
-        # Remove duplicates
-        CHARTS=( `printf "%s\n" "${CHARTS[@]}" | sort -u` )
+        CHARTS=$(ct list-changed --config .ci/ct/ct-lint.yaml)
+        echo "Charts: ${CHARTS}"
         # Set output to changed charts
-        printf "::set-output name=addedOrModified::%s\n" "${CHARTS[*]}"
+        printf "::set-output name=addedOrModifiedCharts::%s\n" "${CHARTS[*]}"
diff --git a/.github/workflows/pr-validate.yaml b/.github/workflows/pr-validate.yaml
index cf2a8270..5d9fa91e 100644
--- a/.github/workflows/pr-validate.yaml
+++ b/.github/workflows/pr-validate.yaml
@@ -18,14 +18,14 @@ concurrency:
 
 jobs:
   pr-metadata:
-    uses: bjw-s/helm-charts/.github/workflows/pr-metadata.yaml@main
+    uses: bjw-s/helm-charts/.github/workflows/pr-metadata.yaml@${{ github.event.pull_request.base.ref }}
 
-  pre-commit-check:
-    uses: bjw-s/helm-charts/.github/workflows/pre-commit-check.yaml@main
-    needs:
-      - pr-metadata
-    with:
-      modifiedFiles: ${{ needs.pr-metadata.outputs.addedOrModifiedFiles }}
+  # pre-commit-check:
+  #   uses: bjw-s/helm-charts/.github/workflows/pre-commit-check.yaml@main
+  #   needs:
+  #     - pr-metadata
+  #   with:
+  #     modifiedFiles: ${{ needs.pr-metadata.outputs.addedOrModifiedFiles }}
 
   # charts-changelog:
   #   uses: bjw-s/helm-charts/.github/workflows/charts-changelog.yaml@main
@@ -36,14 +36,14 @@ jobs:
   #     isRenovatePR: ${{ needs.pr-metadata.outputs.isRenovatePR }}
   #     modifiedCharts: ${{ needs.pr-metadata.outputs.addedOrModifiedCharts }}
 
-  charts-lint:
-    uses: bjw-s/helm-charts/.github/workflows/charts-lint.yaml@main
-    needs:
-      - pr-metadata
-      - charts-changelog
-    with:
-      checkoutCommit: ${{ needs.charts-changelog.outputs.commitHash }}
-      chartChangesDetected: ${{ needs.pr-metadata.outputs.addedOrModified }}
+  # charts-lint:
+  #   uses: bjw-s/helm-charts/.github/workflows/charts-lint.yaml@main
+  #   needs:
+  #     - pr-metadata
+  #     - charts-changelog
+  #   with:
+  #     checkoutCommit: ${{ needs.charts-changelog.outputs.commitHash }}
+  #     chartChangesDetected: ${{ needs.pr-metadata.outputs.addedOrModified }}
 
   # charts-test:
   #   uses: bjw-s/helm-charts/.github/workflows/charts-test.yaml@main