From 372a284c77f4409e69de798fdf77ba15387fee74 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Wed, 3 Dec 2025 21:46:38 -0600 Subject: [PATCH] fix grep --- .gitea/workflows/lint-test-docker.yaml | 5 ++--- .gitea/workflows/lint-test-helm.yaml | 6 ++---- .gitea/workflows/render-manifests-automerge.yaml | 2 +- .gitea/workflows/render-manifests-merge.yaml | 2 +- .gitea/workflows/render-manifests-push.yaml | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/lint-test-docker.yaml b/.gitea/workflows/lint-test-docker.yaml index a1907b135..08f426aa5 100644 --- a/.gitea/workflows/lint-test-docker.yaml +++ b/.gitea/workflows/lint-test-docker.yaml @@ -53,18 +53,17 @@ jobs: if: steps.branch-exists.outputs.exists == 'true' run: | CHANGED_COMPOSE=() - GIT_DIFF=() echo ">> Target branch for diff is: ${BASE_BRANCH}" 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 "hosts/*/**") + GIT_DIFF=$(git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u | grep -E "hosts/[^/]+/[^/]+") 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 "hosts/*/**") + GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u | grep -E "hosts/[^/]+/[^/]+") fi if [ -n "${GIT_DIFF}" ]; then diff --git a/.gitea/workflows/lint-test-helm.yaml b/.gitea/workflows/lint-test-helm.yaml index 603d68f8b..89a612ba4 100644 --- a/.gitea/workflows/lint-test-helm.yaml +++ b/.gitea/workflows/lint-test-helm.yaml @@ -55,19 +55,17 @@ jobs: if: steps.branch-exists.outputs.exists == 'true' run: | CHANGED_CHARTS=() - GIT_DIFF=() echo ">> Target branch for diff is: ${BASE_BRANCH}" if [ "${{ github.event_name }}" == "pull_request" ]; then echo "" echo ">> Checking for changes in a pull request ..." - git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u - GIT_DIFF=$(git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u | grep "clusters/*/helm/**") + GIT_DIFF=$(git diff --name-only "${BASE_BRANCH}" | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+") 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 "clusters/*/helm/**") + GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+") fi if [ -n "${GIT_DIFF}" ]; then diff --git a/.gitea/workflows/render-manifests-automerge.yaml b/.gitea/workflows/render-manifests-automerge.yaml index 9b0211c1e..bfc739066 100644 --- a/.gitea/workflows/render-manifests-automerge.yaml +++ b/.gitea/workflows/render-manifests-automerge.yaml @@ -65,7 +65,7 @@ jobs: RENDER_DIR=() echo ">> Checking for changes from HEAD^..HEAD ..." - GIT_DIFF=$(git diff --name-only HEAD^..HEAD | xargs -I {} dirname {} | sort -u | grep "clusters/cl01tl/helm/") + GIT_DIFF=$(git diff --name-only HEAD^..HEAD | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+") if [ -n "${GIT_DIFF}" ]; then echo ">> Changes detected:" diff --git a/.gitea/workflows/render-manifests-merge.yaml b/.gitea/workflows/render-manifests-merge.yaml index 73868ac22..ef57f90be 100644 --- a/.gitea/workflows/render-manifests-merge.yaml +++ b/.gitea/workflows/render-manifests-merge.yaml @@ -70,7 +70,7 @@ jobs: RENDER_DIR=() echo ">> Checking for changes from HEAD^..HEAD ..." - GIT_DIFF=$(git diff --name-only HEAD^..HEAD | xargs -I {} dirname {} | sort -u | grep "clusters/cl01tl/helm/") + GIT_DIFF=$(git diff --name-only HEAD^..HEAD | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+") if [ -n "${GIT_DIFF}" ]; then echo ">> Changes detected:" diff --git a/.gitea/workflows/render-manifests-push.yaml b/.gitea/workflows/render-manifests-push.yaml index c0cb7713f..bcfb24c64 100644 --- a/.gitea/workflows/render-manifests-push.yaml +++ b/.gitea/workflows/render-manifests-push.yaml @@ -68,7 +68,7 @@ jobs: RENDER_DIR=() echo ">> Checking for changes ..." - GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u | grep "clusters/cl01tl/helm/") + GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..HEAD | xargs -I {} dirname {} | sort -u | grep -E "clusters/[^/]+/helm/[^/]+") if [ -n "${GIT_DIFF}" ]; then echo ">> Changes detected:"