From e6f4d9190d0d6882e9e87fbf49b2d3f6dd896706 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Wed, 10 Dec 2025 22:30:58 -0600 Subject: [PATCH] change check --- .gitea/workflows/lint-test-docker.yaml | 19 +++++++++++++------ .gitea/workflows/lint-test-helm.yaml | 15 +++++++++++---- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/lint-test-docker.yaml b/.gitea/workflows/lint-test-docker.yaml index 745dacc82..76c0e2c98 100644 --- a/.gitea/workflows/lint-test-docker.yaml +++ b/.gitea/workflows/lint-test-docker.yaml @@ -65,23 +65,25 @@ jobs: if [ "${{ github.event_name }}" == "pull_request" ]; then echo "" echo ">> Checking for changes in a pull request ..." - GIT_DIFF=$(git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u | grep -E "hosts/[^/]+/[^/]+") - echo "---" + GIT_DIFF=$(git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u) else echo "" echo ">> Checking for changes from a push ..." - GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u | grep -E "hosts/[^/]+/[^/]+") + GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u) fi - echo "-----" if [ -n "${GIT_DIFF}" ]; then echo "" echo ">> Changes detected:" echo "$GIT_DIFF" for path in $GIT_DIFF; do - CHANGED_COMPOSE+=$(echo "$path") - CHANGED_COMPOSE+=$(echo " ") + if [[ echo "$path" | grep -q -E "hosts/[^/]+/[^/]+" ]]; then + echo "" + echo ">> Adding path: $path" + CHANGED_COMPOSE+=$(echo "$path") + CHANGED_COMPOSE+=$(echo " ") + fi done else @@ -102,6 +104,11 @@ jobs: echo "$(echo "${CHANGED_COMPOSE}" | sort -u)" >> $GITEA_OUTPUT echo "EOF" >> $GITEA_OUTPUT else + echo "" + echo ">> Did not find any docker compose files to lint" + + echo "----" + echo "changes-detected=false" >> $GITEA_OUTPUT fi diff --git a/.gitea/workflows/lint-test-helm.yaml b/.gitea/workflows/lint-test-helm.yaml index 7624de3a0..4584de49a 100644 --- a/.gitea/workflows/lint-test-helm.yaml +++ b/.gitea/workflows/lint-test-helm.yaml @@ -68,22 +68,24 @@ jobs: echo "" echo ">> Checking for changes in a pull request ..." GIT_DIFF=$(git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+") - echo "---" else echo "" echo ">> Checking for changes from a push ..." GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+") fi - echo "-----" if [ -n "${GIT_DIFF}" ]; then echo "" echo ">> Changes detected:" echo "$GIT_DIFF" for path in $GIT_DIFF; do - CHANGED_CHARTS+=$(echo "$path" | awk -F '/' '{print $4}') - CHANGED_CHARTS+=$(echo " ") + if [[ echo "$path" | grep -q -E "clusters/[^/]+/helm/[^/]+" ]]; then + echo "" + echo ">> Adding path: $path" + CHANGED_CHARTS+=$(echo "$path" | awk -F '/' '{print $4}') + CHANGED_CHARTS+=$(echo " ") + fi done else @@ -104,6 +106,11 @@ jobs: echo "$(echo "${CHANGED_CHARTS}" | sort -u)" >> $GITEA_OUTPUT echo "EOF" >> $GITEA_OUTPUT else + echo "" + echo ">> Did not find any helm charts files to lint" + + echo "----" + echo "changes-detected=false" >> $GITEA_OUTPUT fi