hopeful fix for file not commiting

Author: Blargian

.github/workflows/trademark-cla-approval.yml

@@ -24,7 +24,7 @@ jobs:
         id: process-comment
         uses: actions/github-script@v7
         with:
-          github-token: ${{ steps.generate-token.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token || secrets.GITHUB_TOKEN }}
           script: |
             // Only process comments on pull requests
             if (!context.payload.issue.pull_request) {
@@ -141,6 +141,7 @@ jobs:
             core.setOutput('pr_number', prNumber);
             core.setOutput('pr_author', prAuthor);
             core.setOutput('approved_by', prAuthor);
+            core.setOutput('pr_head_sha', pr.head.sha);
             
             // Add confirmation comment
             const confirmationBody = [
@@ -169,7 +170,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ steps.generate-token.outputs.token }}
+          # For issue_comment events, checkout the PR head
+          ref: ${{ steps.process-comment.outputs.pr_head_sha }}
+          token: ${{ steps.generate-token.outputs.token || secrets.GITHUB_TOKEN }}
 
       - name: Record signature to file
         if: success() && steps.process-comment.outputs.pr_number != ''
@@ -178,6 +181,13 @@ jobs:
           
           echo "=== Recording signature immediately after label addition ==="
           
+          # Debug: Check current working directory and branch
+          echo "=== Debug Info ==="
+          pwd
+          echo "Current branch: $(git branch --show-current)"
+          echo "Git remote: $(git remote -v)"
+          ls -la contribute/ 2>/dev/null || echo "contribute/ directory does not exist"
+          
           # Get signature details
           USERNAME="${{ steps.process-comment.outputs.pr_author }}"
           DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
@@ -206,6 +216,7 @@ jobs:
           
           if [ -z "$EXISTING" ]; then
             # Add new signature
+            echo "Adding signature to file..."
             jq --arg user "$USERNAME" \
                --arg date "$DATE" \
                --arg pr "$PR_NUMBER" \
@@ -218,6 +229,8 @@ jobs:
                }]' "$SIGNATURES_FILE" > tmp.json && mv tmp.json "$SIGNATURES_FILE"
             
             echo "✅ Added signature for $USERNAME"
+            echo "File contents after update:"
+            cat "$SIGNATURES_FILE"
           else
             echo "ℹ️ Signature already exists for $USERNAME on PR #$PR_NUMBER"
           fi
@@ -226,13 +239,22 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
           
-          # Check if there are changes and commit
-          if ! git diff --quiet "$SIGNATURES_FILE"; then
-            git add "$SIGNATURES_FILE"
+          # Debug: Check git status
+          echo "=== Git status ==="
+          git status
+          
+          echo "=== Git diff ==="
+          git diff "$SIGNATURES_FILE"
+          
+          # Add the file to git and commit
+          git add "$SIGNATURES_FILE"
+          
+          # Check if there are staged changes
+          if ! git diff --cached --quiet; then
             git commit -m "Add trademark addendum signature for @$USERNAME (PR #$PR_NUMBER)" \
                        -m "This signature was recorded automatically by the CLA approval workflow."
             git push
             echo "✅ Signature committed and pushed successfully"
           else
-            echo "ℹ️ No changes to commit"
+            echo "ℹ️ No staged changes to commit"
           fi