ci: enhance generate-template workflow to handle branch creation and updates

Author: paul58914080

.github/workflows/generate-template.yaml

@@ -1,33 +1,43 @@
 name: Generate Template
+
+on:
+  workflow_dispatch:
+
 permissions:
   contents: write
   pull-requests: write
-on:
-  workflow_dispatch:
+
 jobs:
   generate-template:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout main branch
         uses: actions/checkout@v4
         with:
           ref: main
           token: ${{ secrets.PAT_TOKEN || secrets.GITHUB_TOKEN }}
           persist-credentials: true
-          fetch-depth: '0'
+          fetch-depth: 0
 
-      - name: Prepare branch for generated template
+      - name: Prepare or reuse generated-template branch
         id: prepare_branch
         run: |
           BRANCH="generated-template"
-          echo "branch=${BRANCH}" >> $GITHUB_OUTPUT
           git fetch origin
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
+
           if git show-ref --verify --quiet refs/remotes/origin/$BRANCH; then
+            echo "Branch exists — checking out and pulling latest"
             git checkout $BRANCH
             git pull origin $BRANCH
           else
+            echo "Branch does not exist — creating new one"
             git checkout -b $BRANCH
+            git push --set-upstream origin $BRANCH
           fi
+          echo "branch=${BRANCH}" >> $GITHUB_OUTPUT
 
       - name: Make script executable
         run: chmod +x ./generate-cookiecutter-template-from-example-project.sh
@@ -39,44 +49,21 @@ jobs:
         run: |
           rsync -a --delete --exclude='.git' ./example-template/ ./{{cookiecutter.app_name}}/
 
-      # Use EndBug's add-and-commit Action instead of manual git commands
       - name: Commit changes
         id: commit
-        uses: EndBug/add-and-commit@v9
-        with:
-          message: "ci: update generated cookiecutter template from example"
-          add: "."
-          push: true
-          author_name: GitHub Actions Bot
-          author_email: github-actions[bot]@users.noreply.github.com
-          default_author: github_actions
-          cwd: "."
-
-      # Verify commit exists on GitHub
-      - name: Verify commit exists on GitHub
-        if: steps.commit.outputs.committed == 'true'
-        env:
-          BRANCH_NAME: ${{ steps.prepare_branch.outputs.branch }}
         run: |
-          echo "Step outputs from commit action:"
-          echo "Commit SHA: ${{ steps.commit.outputs.commit_long_sha }}"  
-          echo "Waiting 5 seconds for GitHub to process commit..."
-          sleep 5
-          
-          git fetch origin ${BRANCH_NAME}
-          REMOTE_SHA=$(git rev-parse "origin/${BRANCH_NAME}")
-          echo "Remote HEAD: $REMOTE_SHA"
-          
-          if [[ "$REMOTE_SHA" == "${{ steps.commit.outputs.commit_long_sha }}" ]]; then
-            echo "✅ Verified: Commit is on GitHub"
+          git add .
+          if git diff --cached --quiet; then
+            echo "no_changes=true" >> $GITHUB_OUTPUT
+            echo "✅ No changes detected."
           else
-            echo "⚠️ Warning: Commit verification failed, but continuing..."
-            # Don't fail the workflow if verification fails,
-            # the commit might still be processing on GitHub's side
+            git commit -m "ci: update generated cookiecutter template from example"
+            git push origin generated-template
+            echo "no_changes=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: Create Pull Request
-        if: steps.commit.outputs.committed == 'true'
+      - name: Create or Update Pull Request
+        if: steps.commit.outputs.no_changes == 'false'
         uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -85,6 +72,7 @@ jobs:
           title: "ci: update generated cookiecutter template from example"
           body: |
             This PR was created automatically by the Generate Template workflow.
-            Contains updates generated from the example project.
+            It contains updates generated from the example project.
+          commit-message: "ci: update generated cookiecutter template from example"
           labels: automated-pr
           delete-branch: false