Skip to content

fix(ci): Dependabot automerge test fixes #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbuck merged 2 commits into from
May 12, 2026
Merged

fix(ci): Dependabot automerge test fixes #148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffbf7a6
fix(ci): Always create directories that may not exist when adding or …
jbuck May 12, 2026
5b560fd
fix(ci): Allow conftest to exit with an error code
jbuck May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/diff-rendered-charts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -268,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)

Expand Down
Loading