Refactor visitor counter GitHub Actions workflow

Refactor GitHub Actions workflow for visitor counter. Improved checkout process, added concurrency control, and streamlined commit logic.

Author: brown9804

.github/workflows/use-visitor-counter.yml

@@ -2,33 +2,55 @@ name: Use Visitor Counter Logic
 
 on:
   pull_request:
-    branches:
-      - main
-  workflow_dispatch:  # Allows manual triggering
+    branches: [main]
+  workflow_dispatch:
   # schedule:
   #   - cron: '0 0 * * *' # Runs daily at midnight
-  
+
 permissions:
   contents: write
   pull-requests: write
 
+# Prevent parallel runs from racing on the same branch
+concurrency:
+  group: visitor-counter-${{ github.repository }}-${{ github.event.pull_request.head.ref || github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   update-visitor-count:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout current repository
+      # Checkout the *actual branch* we intend to push to
+      # (avoids being on refs/pull/<id>/merge and needing a later checkout)
+      - name: Checkout target branch
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          clean: true
+          persist-credentials: false
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref_name }}
+
+      - name: Configure Git author
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      # Optional but recommended: sync before generating changes (no checkout later)
+      - name: Sync branch with origin
+        env:
+          TARGET_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref_name }}
+        run: |
+          git fetch origin "$TARGET_REF"
+          git pull --no-rebase --no-edit origin "$TARGET_REF" || true
 
       - name: Shallow clone visitor counter logic
         run: git clone --depth=1 https://github.com/brown9804/github-visitor-counter.git
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "20"
 
       - name: Install dependencies for github-visitor-counter
         run: |
@@ -44,43 +66,20 @@ jobs:
       - name: Move generated metrics.json to root
         run: mv github-visitor-counter/metrics.json .
 
-      - name: List files for debugging
-        run: |
-          ls -l
-          ls -l github-visitor-counter
-
       - name: Clean up visitor counter logic
         run: rm -rf github-visitor-counter
 
-      - name: Configure Git author
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      # Commit and push logic for PR events (merge, not rebase)
-      - name: Commit and push changes (PR)
-        if: github.event_name == 'pull_request'
+      - name: Commit and push (only if changed)
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TARGET_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref_name }}
         run: |
-          git fetch origin
-          git checkout ${{ github.head_ref }}
-          git pull origin ${{ github.head_ref }} || echo "No merge needed"
-          git add -A
-          git commit -m "Update visitor count" || echo "No changes to commit"
-          git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-          git push origin HEAD:${{ github.head_ref }}
+          if [ -z "$(git status --porcelain)" ]; then
+            echo "No changes to commit"
+            exit 0
+          fi
 
-      # Commit and push logic for non-PR events (merge, not rebase)
-      - name: Commit and push changes (non-PR)
-        if: github.event_name != 'pull_request'
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git fetch origin
-          git checkout ${{ github.ref_name }} || git checkout -b ${{ github.ref_name }} origin/${{ github.ref_name }}
-          git pull origin ${{ github.ref_name }} || echo "No merge needed"
           git add -A
-          git commit -m "Update visitor count" || echo "No changes to commit"
-          git remote set-url origin https://x-access-token:${TOKEN}@github.com/${{ github.repository }}
-          git push origin HEAD:${{ github.ref_name }}
+          git commit -m "Update visitor count"
+
+          git push "https://x-access-token:${TOKEN}@github.com/${{ github.repository }}" "HEAD:${TARGET_REF}"