From ffbf7a68b471ef92dcfa16f1acc2d2c48f70033f Mon Sep 17 00:00:00 2001
From: Jon Buckley <jbuckley@mozilla.com>
Date: Tue, 12 May 2026 12:34:24 -0400
Subject: [PATCH 1/2] fix(ci): Always create directories that may not exist
 when adding or removing values files

MZCLD-3001
---
 .github/workflows/diff-rendered-charts.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/diff-rendered-charts.yml b/.github/workflows/diff-rendered-charts.yml
index 26ab54e..71c53ae 100644
--- a/.github/workflows/diff-rendered-charts.yml
+++ b/.github/workflows/diff-rendered-charts.yml
@@ -240,12 +240,19 @@ jobs:
           shopt -s nullglob
 
           for chart in ${CHARTS}; do
+            # When adding or removing a values file the `render_charts` job will only render one side of the chart to be compared
+            # Create the directory to be compared if it doesn't exist so `find` succeeds
+            mkdir -p "shared/base-charts/${chart}" "shared/head-charts/${chart}"
+
             CONFIGS=`find "shared/base-charts/${chart}" "shared/head-charts/${chart}" -mindepth 1 -maxdepth 1 -type d -print0 | xargs --null basename -a | sort | uniq`
 
             mkdir -p diff/${chart}
 
             for config in ${CONFIGS}; do
               for dir in "shared/base-charts/${chart}/${config}" "shared/head-charts/${chart}/${config}"; do
+                # Create the directory to be compared if it doesn't exist so `find` succeeds
+                mkdir -p "${dir}"
+
                 OUTPUT_FILE="${dir}.yaml"
 
                 touch "$OUTPUT_FILE"

From 5b560fdb2af67efaef558f3d3de15f3e5efc80a9 Mon Sep 17 00:00:00 2001
From: Jon Buckley <jbuckley@mozilla.com>
Date: Tue, 12 May 2026 16:23:54 -0400
Subject: [PATCH 2/2] fix(ci): Allow conftest to exit with an error code

MZCLD-2112
---
 .github/workflows/diff-rendered-charts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/diff-rendered-charts.yml b/.github/workflows/diff-rendered-charts.yml
index 71c53ae..9745460 100644
--- a/.github/workflows/diff-rendered-charts.yml
+++ b/.github/workflows/diff-rendered-charts.yml
@@ -275,7 +275,7 @@ jobs:
         run: |
           set -uo pipefail
 
-          CONFTEST_OUTPUT=$(conftest test --no-color --no-fail --strict --update https://raw.githubusercontent.com/mozilla/helm-charts/main/policy/helm-automerge.rego diff)
+          CONFTEST_OUTPUT=$(conftest test --no-color --strict --update https://raw.githubusercontent.com/mozilla/helm-charts/main/policy/helm-automerge.rego diff)
           CONFTEST_EXIT_CODE=$?
           STATUS_DESCRIPTION=$(echo "$CONFTEST_OUTPUT" | tail -1)