Update php Docker tag to v8.5.0

.gitea/workflows/render-manifests.yaml

@@ -12,7 +12,6 @@ on:
 
 env:
   CLUSTERS: cl01tl
-  BASE_BRANCH: manifests
 
 jobs:
   render-manifests-helm:
@@ -31,7 +30,7 @@ jobs:
 
       - name: Render Helm Manifests
         run: |
-          for cluster in ${CLUSTERS}; do
+          for cluster in $CLUSTERS; do
             mkdir -p ${{ gitea.workspace }}/clusters/$cluster/manifests
 
             for chart_path in ${{ gitea.workspace }}/clusters/$cluster/helm/*; do
@@ -68,88 +67,32 @@ jobs:
             done
           done
 
-      # - name: Create Pull Request
-      #   id: pull-request
-      #   uses: peter-evans/create-pull-request@v7
-      #   with:
-      #     token: ${{ secrets.BOT_TOKEN }}
-      #     add-paths: |
-      #       clusters/cl01tl/manifests/*
-      #     commit-message: "chore: Update manifests after chart change"
-      #     committer: gitea-bot <gitea-bot@alexlebens.net>
-      #     author: gitea-bot <gitea-bot@alexlebens.net>
-      #     branch: auto/update-manifests
-      #     branch-suffix: timestamp
-      #     base: manifests
-      #     title: "Manifest Update"
-      #     body: |
-      #       This PR contains the newly rendered Kubernetes manifests.
-
-      #       * Triggered by workflow run ${{ github.run_id }}
-      #       * Review the `files changed` tab for the full YAML diff.
-      #     labels: |
-      #       manifests
-      #       automated
-
-      - name: Check for Changes
-        id: check-changes
-        run: |
-          if git status --porcelain | grep -q .; then
-            echo ">> Changes detected"
-            echo "changes-detected=true" >> $GITEA_OUTPUT
-          else
-            echo ">> No changes detected, skipping PR creation"
-            exit 0
-          fi
-
-      - name: Commit and Push Changes
-        id: commit-push
-        if: steps.check-changes.outputs.changes-detected == 'true'
-        run: |
-          BRANCH_NAME="auto/update-manifests-$(date +%s)"
-
-          # Configure Git
-          git config user.name "gitea-bot"
-          git config user.email "gitea-bot@alexlebens.net"
-
-          # Create a new branch and stage all changes
-          git checkout -b $BRANCH_NAME
-          git add .
-          git commit -m "chore: Update manifests after change"
-
-          # Push the new branch to the remote repository
-          REPO_URL="${{ secrets.REPO_URL }}/${{ gitea.repository }}"
-          git push -u "https://oauth2:${{ secrets.BOT_TOKEN }}@$(echo $REPO_URL | sed -e 's|https://||')" $BRANCH_NAME
-
-          echo "HEAD_BRANCH=$BRANCH_NAME" >> $GITEA_OUTPUT
-          echo "push=true" >> $GITEA_OUTPUT
-
       - name: Create Pull Request
-        id: create-pull-request
+        id: pull-request
-        if: steps.commit-push.outputs.push == 'true'
+        uses: peter-evans/create-pull-request@v7
-        env:
+        with:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+          token: ${{ secrets.BOT_TOKEN }}
-          GITEA_URL: ${{ secrets.REPO_URL }}
+          add-paths: |
-          OWNER: ${{ gitea.repository_owner }}
+            clusters/cl01tl/manifests/*
-          REPO: ${{ gitea.repository_name }}
+          commit-message: "chore: Update manifests after chart change"
-          HEAD_BRANCH: ${{ steps.commit-push.outputs.HEAD_BRANCH }}
+          committer: gitea-bot <gitea-bot@alexlebens.net>
-        run: |
+          author: gitea-bot <gitea-bot@alexlebens.net>
-          echo ">> Creating PR from branch: ${HEAD_BRANCH} into ${BASE_BRANCH}"
+          branch: auto/update-manifests
+          branch-suffix: timestamp
+          base: manifests
+          title: "Manifest Update"
+          body: |
+            This PR contains the newly rendered Kubernetes manifests.
 
-          apt update && apt install tea
+            * Triggered by workflow run ${{ github.run_id }}
-
+            * Review the `files changed` tab for the full YAML diff.
-          tea pulls create \
+          labels: |
-            --repo "${OWNER}/${REPO}" \
+            manifests
-            --head "${HEAD_BRANCH}" \
+            automated
-            --base "${BASE_BRANCH}" \
-            --title "Automated Manifest Update: $(date +%F)" \
-            --body "This PR contains newly rendered Kubernetes manifests automatically generated by the CI workflow."
-
-          echo "pull-request-operation=created" >> $GITEA_OUTPUT
 
       # - name: ntfy Created
       #   uses: niniyas/ntfy-action@master
-      #   if: steps.create-pull-request.outputs.pull-request-operation == 'created'
+      #   if: steps.pull-request.outputs.pull-request-operation == 'created'
       #   with:
       #     url: "${{ secrets.NTFY_URL }}"
       #     topic: "${{ secrets.NTFY_TOPIC }}"