fix: direct API sync for updates.xml (PR blocked by reviews)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jonathan Miller
2026-04-23 00:00:33 -05:00
parent 765bb9b368
commit b158e7684c

View File

@@ -479,19 +479,12 @@ jobs:
# Push to current branch # Push to current branch
git push || true git push || true
# Sync updates.xml to main via PR (respects branch protection) # Sync updates.xml to main via direct API
if [ "$CURRENT_BRANCH" != "main" ]; then
GA_TOKEN="${{ secrets.GA_TOKEN }}" GA_TOKEN="${{ secrets.GA_TOKEN }}"
API="${GITEA_URL}/api/v1/repos/${{ github.repository }}" API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
PR_BRANCH="chore/update-xml-${VERSION}"
curl -sf -X POST -H "Authorization: token ${GA_TOKEN}" \
-H "Content-Type: application/json" \
"${API}/branches" \
-d "$(jq -n --arg name "$PR_BRANCH" '{new_branch_name: $name, old_branch_name: "main"}')" > /dev/null 2>&1 || true
FILE_SHA=$(curl -sf -H "Authorization: token ${GA_TOKEN}" \ FILE_SHA=$(curl -sf -H "Authorization: token ${GA_TOKEN}" \
"${API}/contents/updates.xml?ref=${PR_BRANCH}" | jq -r '.sha // empty') "${API}/contents/updates.xml?ref=main" | jq -r '.sha // empty')
if [ -n "$FILE_SHA" ]; then if [ -n "$FILE_SHA" ]; then
CONTENT=$(base64 -w0 updates.xml) CONTENT=$(base64 -w0 updates.xml)
@@ -501,33 +494,12 @@ jobs:
-d "$(jq -n \ -d "$(jq -n \
--arg content "$CONTENT" \ --arg content "$CONTENT" \
--arg sha "$FILE_SHA" \ --arg sha "$FILE_SHA" \
--arg msg "chore: update ${STABILITY} channel to ${VERSION} [skip ci]" \ --arg msg "chore: sync updates.xml ${STABILITY} ${VERSION} [skip ci]" \
--arg branch "$PR_BRANCH" \ --arg branch "main" \
'{content: $content, sha: $sha, message: $msg, branch: $branch}' '{content: $content, sha: $sha, message: $msg, branch: $branch}'
)" > /dev/null 2>&1 )" > /dev/null 2>&1 \
&& echo "updates.xml synced to main" \
PR_NUM=$(curl -sf -X POST -H "Authorization: token ${GA_TOKEN}" \ || echo "WARNING: failed to sync updates.xml to main"
-H "Content-Type: application/json" \
"${API}/pulls" \
-d "$(jq -n \
--arg title "chore: update updates.xml for ${VERSION} [skip ci]" \
--arg head "$PR_BRANCH" \
--arg base "main" \
--arg body "Auto-generated by release workflow." \
'{title: $title, head: $head, base: $base, body: $body}'
)" | jq -r '.number // empty')
if [ -n "$PR_NUM" ]; then
curl -sf -X POST -H "Authorization: token ${GA_TOKEN}" \
-H "Content-Type: application/json" \
"${API}/pulls/${PR_NUM}/merge" \
-d '{"Do":"merge","merge_message_field":"chore: update updates.xml for '"${VERSION}"' [skip ci]"}' > /dev/null 2>&1 \
&& echo "updates.xml synced to main via PR #${PR_NUM}" \
|| echo "PR #${PR_NUM} created — merge manually"
curl -sf -X DELETE -H "Authorization: token ${GA_TOKEN}" \
"${API}/branches/${PR_BRANCH}" > /dev/null 2>&1 || true
fi
fi
fi fi
- name: Summary - name: Summary