ci: use AUTO_MERGE_TOKEN secret for docs auto-merge
All checks were successful
Auto-merge docs-only PRs / auto-merge-docs (pull_request) Successful in 3s

The built-in github.token lacks write permission to push to main.
Use a dedicated token stored as a repo secret instead.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Cal Corum 2026-03-18 23:37:07 -05:00
parent 1eda939de6
commit 6bc95b5679

View File

@ -12,7 +12,7 @@ jobs:
- name: Check if all changes are markdown
id: check
env:
GITEA_TOKEN: ${{ github.token }}
GITEA_TOKEN: ${{ secrets.AUTO_MERGE_TOKEN }}
run: |
PR_NUMBER=${{ github.event.pull_request.number }}
API_URL="${{ github.server_url }}/api/v1/repos/${{ github.repository }}/pulls/${PR_NUMBER}/files"
@ -42,42 +42,21 @@ jobs:
- name: Approve and merge
if: steps.check.outputs.docs_only == 'true'
env:
GITEA_TOKEN: ${{ github.token }}
GITEA_TOKEN: ${{ secrets.AUTO_MERGE_TOKEN }}
run: |
PR_NUMBER=${{ github.event.pull_request.number }}
API_BASE="${{ github.server_url }}/api/v1/repos/${{ github.repository }}/pulls/${PR_NUMBER}"
# Approve the PR
curl -s -X POST "${API_BASE}/reviews" \
curl -sf -X POST "${API_BASE}/reviews" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d '{"event": "APPROVED", "body": "Auto-approved: docs-only changes (all .md files)."}'
echo "Attempting merge..."
# Merge the PR
MERGE_RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" -X POST "${API_BASE}/merge" \
curl -sf -X POST "${API_BASE}/merge" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d '{"Do": "merge", "merge_message_field": "Auto-merge: docs-only PR #'"${PR_NUMBER}"'"}')
HTTP_STATUS=$(echo "$MERGE_RESPONSE" | tail -1 | sed 's/HTTP_STATUS://')
BODY=$(echo "$MERGE_RESPONSE" | sed '$d')
echo "Merge response (HTTP ${HTTP_STATUS}):"
echo "$BODY"
if [ "$HTTP_STATUS" -ge 400 ]; then
echo "Merge failed, retrying with rebase strategy..."
MERGE_RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" -X POST "${API_BASE}/merge" \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d '{"Do": "rebase"}')
HTTP_STATUS=$(echo "$MERGE_RESPONSE" | tail -1 | sed 's/HTTP_STATUS://')
BODY=$(echo "$MERGE_RESPONSE" | sed '$d')
echo "Rebase response (HTTP ${HTTP_STATUS}):"
echo "$BODY"
[ "$HTTP_STATUS" -ge 400 ] && exit 1
fi
-d '{"Do": "merge", "merge_message_field": "Auto-merge: docs-only PR #'"${PR_NUMBER}"'"}'
echo "PR #${PR_NUMBER} auto-approved and merged."