Update php Docker tag to v8.5.0

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

@@ -211,16 +211,13 @@ jobs:
         run: |
           cd ${MANIFEST_DIR}
 
-          GIT_CHANGES=$(git status --porcelain)
-
-          if [ -n "$GIT_CHANGES" ]; then
+          if git status --porcelain | grep -q .; then
             echo ">> Changes detected"
             git status --porcelain
             echo "changes-detected=true" >> $GITEA_OUTPUT
-
           else
             echo ">> No changes detected, skipping PR creation"
-
+            exit 0
           fi
 
           echo "----"
@@ -328,7 +325,8 @@ jobs:
 
           PAYLOAD=$( jq -n \
             --arg Do "merge" \
-            '{Do: $Do}' )
+            --arg delete_branch_after_merge "true" \
+            '{Do: $Do, delete_branch_after_merge: $delete_branch_after_merge}' )
 
           echo ">> Merging PR with ID: ${PR_ID}"
           echo ">> With Endpoint of:"

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

@@ -197,11 +197,14 @@ jobs:
         run: |
           cd ${MANIFEST_DIR}
 
-          GIT_CHANGES=$(git status --porcelain)
+          git status --porcelain --untracked-files=all | grep '^.'
 
-          if [ -n "$GIT_CHANGES" ]; then
+          git status --porcelain --untracked-files=all | grep -q '^.'
+          echo $?
+
+          if git status --porcelain --untracked-files=all | grep -q '^.' ; then
             echo ">> Changes detected"
-            git status --porcelain
+            # git status --porcelain --untracked-files=all
             echo "changes-detected=true" >> $GITEA_OUTPUT
 
           else

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

@@ -216,16 +216,13 @@ jobs:
         run: |
           cd ${MANIFEST_DIR}
 
-          GIT_CHANGES=$(git status --porcelain)
-
-          if [ -n "$GIT_CHANGES" ]; then
+          if git status --porcelain | grep -q .; then
             echo ">> Changes detected"
             git status --porcelain
             echo "changes-detected=true" >> $GITEA_OUTPUT
-
           else
             echo ">> No changes detected, skipping PR creation"
-
+            exit 0
           fi
 
           echo "----"

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

@@ -214,16 +214,13 @@ jobs:
         run: |
           cd ${MANIFEST_DIR}
 
-          GIT_CHANGES=$(git status --porcelain)
-
-          if [ -n "$GIT_CHANGES" ]; then
+          if git status --porcelain | grep -q .; then
             echo ">> Changes detected"
             git status --porcelain
             echo "changes-detected=true" >> $GITEA_OUTPUT
-
           else
             echo ">> No changes detected, skipping PR creation"
-
+            exit 0
           fi
 
           echo "----"