ci: fix oversights that I missed in testing (#603)

Author: vladfrangu

.github/workflows/update-templates.yml

@@ -20,6 +20,7 @@ on:
       - update-templates
 
 env:
+    BASE_IMAGE_RAW: ${{ github.event.client_payload.base_image || inputs.base_image }}
     RAW_BRANCH_NAME: ci/${{ github.event.client_payload.base_image || inputs.base_image }}
     BASE_IMAGE: ${{ github.event.client_payload.base_image || inputs.base_image }}
     DEFAULT_RUNTIME_VERSION: ${{ github.event.client_payload.default_runtime_version || inputs.default_runtime_version }}
@@ -68,19 +69,21 @@ jobs:
 
       - name: Run update script
         env:
-          BASE_IMAGE: ${{ steps.branch-name.outputs.BRANCH_NAME }}
+          BASE_IMAGE: ${{ env.BASE_IMAGE_RAW }}
           DEFAULT_RUNTIME_VERSION: ${{ env.DEFAULT_RUNTIME_VERSION }}
           MODULE_VERSION: ${{ env.MODULE_VERSION }}
         run: node ./scripts/actions/update-templates.mts
 
       - name: Commit and push changes
+        id: commit-and-push
         run: |
           # Check if there are any changes
           if git diff --quiet && git diff --cached --quiet; then
             echo "No changes to commit"
           else
             git add -A
-            git commit -m "chore: Update templates for base image: ${{ steps.branch-name.outputs.BRANCH_NAME }}"
+            git commit -m "chore: Update templates for base image: ${{ env.BASE_IMAGE_RAW }}"
+            echo "committed=true" >> $GITHUB_OUTPUT
           fi
 
           # Force push the branch
@@ -89,6 +92,7 @@ jobs:
       - name: Create Pull Request
         env:
           GH_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
+        if: steps.commit-and-push.outputs.committed == 'true'
         run: |
           # Check if PR already exists
           PR_EXISTS=$(gh pr list --head "${{ steps.branch-name.outputs.BRANCH_NAME }}" --base master --json number --jq length)
@@ -97,10 +101,10 @@ jobs:
             echo "Creating new PR"
             gh pr create \
               --title "chore: Update templates for base image: ${{ steps.branch-name.outputs.BRANCH_NAME }}" \
-              --body "Automated update of templates for base image \`${{ steps.branch-name.outputs.BRANCH_NAME }}\`
+              --body "Automated update of templates for base image \`${{ env.BASE_IMAGE_RAW }}\`
 
               **Parameters:**
-              - Base Image: \`${{ steps.branch-name.outputs.BRANCH_NAME }}\`
+              - Base Image: \`${{ env.BASE_IMAGE_RAW }}\`
               - Runtime Version: \`${{ env.DEFAULT_RUNTIME_VERSION }}\`
               - Module Version: \`${{ env.MODULE_VERSION || 'N/A' }}\`
 
@@ -110,6 +114,18 @@ jobs:
               --reviewer B4nan \
               --reviewer vladfrangu
           else
-            echo "PR already exists for branch ${{ steps.branch-name.outputs.BRANCH_NAME }}"
+            echo "PR already exists for branch ${{ steps.branch-name.outputs.BRANCH_NAME }}, updating it"
+
+            # gh pr edit supports a branch name or a PR number or a URL
+
+            gh pr edit "${{ steps.branch-name.outputs.BRANCH_NAME }}" \
+              --body "Automated update of templates for base image \`${{ env.BASE_IMAGE_RAW }}\`
+
+              **Parameters:**
+              - Base Image: \`${{ env.BASE_IMAGE_RAW }}\`
+              - Runtime Version: \`${{ env.DEFAULT_RUNTIME_VERSION }}\`
+              - Module Version: \`${{ env.MODULE_VERSION || 'N/A' }}\`
+
+              This PR was automatically generated by the [Update Templates](https://github.com/apify/actor-templates/actions/workflows/update-templates.yml) workflow."
           fi