change condition

.gitea/workflows/render-manifests-automerge.yaml

@@ -1,4 +1,4 @@
-name: render-manfiest-automerge
+name: render-manifests-automerge
 
 on:
   pull_request:
@@ -17,7 +17,7 @@ env:
   MANIFEST_DIR: /workspace/alexlebens/infrastructure/infrastructure-manifests
 
 jobs:
-  render-manfiest-automerge:
+  render-manifests-automerge:
     runs-on: ubuntu-js
     if: ${{ (github.event.pull_request.merged == true) && (contains(github.event.pull_request.labels.*.name, 'automerge')) }}
     steps:
@@ -64,8 +64,8 @@ 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/")
+          echo ">> Checking for changes from ${{ gitea.event.before }}..${{ gitea.event.after }} ..."
+          GIT_DIFF=$(git diff --name-only ${{ gitea.event.before }}..${{ gitea.event.after }} | xargs -I {} dirname {} | sort -u | grep "clusters/cl01tl/helm/")
 
           if [ -n "${GIT_DIFF}" ]; then
             echo ">> Changes detected:"

.gitea/workflows/render-manifests.yaml

@@ -20,6 +20,7 @@ env:
 jobs:
   render-manifests:
     runs-on: ubuntu-js
+    if: ${{ !((github.event.pull_request.merged == true) && (contains(github.event.pull_request.labels.*.name, 'automerge'))) }}
     steps:
       - name: Checkout Main
         uses: actions/checkout@v6