From 6fc561930c55824a0ce6698a7f325b18d0d8ab82 Mon Sep 17 00:00:00 2001
From: Giovanni Toraldo <71768+gionn@users.noreply.github.com>
Date: Thu, 25 Jan 2024 11:00:21 +0100
Subject: [PATCH] OPSEXP-2439 Exclude linter_values.yaml from helm ent workflow
 (#1082)

---
 .github/actions/charts-as-json/action.yml | 2 +-
 .github/workflows/helm-enterprise.yml     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/charts-as-json/action.yml b/.github/actions/charts-as-json/action.yml
index 264b1f638..1a549ac6d 100644
--- a/.github/actions/charts-as-json/action.yml
+++ b/.github/actions/charts-as-json/action.yml
@@ -27,7 +27,7 @@ runs:
       run: |
         for CHART_ROOT in ${{ inputs.charts-root }}/*/; do
           CHART=$(basename $CHART_ROOT)
-          VALUES_FILES=$(ls -r ${{ inputs.charts-root }}/"${CHART}"/*values.yaml || true)
+          VALUES_FILES=$(find ${{ inputs.charts-root }}/"${CHART}" -type f -name "*values.yaml" ! -name "linter_values.yaml" -maxdepth 1)
           VALUES=${VALUES_FILES//${CHART_ROOT}/}
           yq e "$YQ_FILTER" "${{ inputs.charts-root }}/${CHART}/Chart.yaml" | \
           jq -c --arg v "${VALUES}" '.values=($v | split("\n"))' > /tmp/outputs_${CHART}.json
diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
index 7a441b4aa..0b8861500 100644
--- a/.github/workflows/helm-enterprise.yml
+++ b/.github/workflows/helm-enterprise.yml
@@ -10,6 +10,7 @@ on:
       - helm/**
       - test/postman/helm/**
       - .github/workflows/helm*
+      - .github/actions/charts-as-json/**
   push:
     branches:
       - master
@@ -61,7 +62,7 @@ jobs:
     timeout-minutes: 10
     needs:
       - build_vars
-    name: Helm ${{ matrix.name }} ${{ matrix.values }}
+    name: ${{ matrix.values }} on ${{ matrix.name }}
     strategy:
       fail-fast: false
       matrix: