fix: make release PR creation robust against race conditions (#19 )

Two fixes for intermittent release workflow failures: - **Use `BASE_BRANCH` instead of `DEFAULT_BRANCH`** for the PR `base` field — `BASE_BRANCH` has a `:-main` fallback, preventing an empty base from causing a 404 - **Replace fixed `sleep 3` with proper polling and retry** — polls for branch readiness (up to 10 attempts) before creating the PR, then retries PR creation (up to 5 attempts) with backoff Fixes the `Error creating PR (HTTP 404)` seen when Gitea hasn't fully indexed the `next-release` branch by the time the PR creation request fires. 🤖 Generated with [Claude Code](https://claude.ai/claude-code) Reviewed-on: #19
Merge pull request 'fix(release): add retry and delay for PR creation to handle Gitea API race condition' (#18 ) from fix-release-pr-race-condition into main
2026-03-23 15:52:25 +00:00 · 2026-02-23 13:13:23 +00:00 · 2026-02-23 14:12:43 +01:00 · 2026-02-12 11:02:43 +00:00 · 2026-02-12 12:02:01 +01:00
1 changed files with 115 additions and 171 deletions
@@ -9,6 +9,10 @@ on:
        default: false
        type: boolean

+concurrency:
+  group: release-${{ github.repository }}
+  cancel-in-progress: false
+
 env:
  GITEA_URL: http://gitea-http.gitea.svc.cluster.local:3000
  RELEASE_TOKEN_FILE: /runner-secrets/release-token
@@ -94,39 +98,18 @@ jobs:
          PR_NOTE="**Note:** Please use **Squash Merge** when merging this PR."
          DESCRIPTION="${CHANGES_CONTENT}"$'\n\n---\n\n'"${PR_NOTE}"

-          echo "Checking for existing release PRs..."
-          PRS=$(curl -sf --retry 3 --retry-delay 2 --retry-connrefused \
-            -H "Authorization: token ${TOKEN}" \
-            "${API_URL}/pulls?state=open" | jq '[.[] | select(.head.ref == "next-release")]')
-          PR_INDEX=$(echo "${PRS}" | jq -r '.[0].number // empty')
-
-          # If PR exists, rebase the branch onto the latest base branch
-          if [ -n "${PR_INDEX}" ]; then
-            echo "Rebasing PR #${PR_INDEX} branch onto ${BASE_BRANCH}..."
-            REBASE_RESPONSE=$(curl -s --retry 3 --retry-delay 2 --retry-connrefused -w "\n%{http_code}" -X POST \
-              -H "Authorization: token ${TOKEN}" \
-              "${API_URL}/pulls/${PR_INDEX}/update?style=rebase")
-            REBASE_CODE=$(echo "${REBASE_RESPONSE}" | tail -1)
-            if [ "${REBASE_CODE}" = "200" ]; then
-              echo "Successfully rebased branch onto ${BASE_BRANCH}"
-            elif [ "${REBASE_CODE}" = "409" ]; then
-              echo "Branch already up to date or rebase conflict - continuing with update"
-            else
-              echo "Warning: Rebase returned ${REBASE_CODE}, continuing anyway"
-            fi
-          fi
-
+          # Delete existing next-release branch to start fresh (auto-closes any open PR)
          echo "Checking for existing next-release branch..."
          BRANCH_CHECK=$(curl -s --retry 3 --retry-delay 2 --retry-connrefused -w "%{http_code}" -o /dev/null \
            -H "Authorization: token ${TOKEN}" \
            "${API_URL}/branches/next-release")
-          echo "Branch check HTTP status: ${BRANCH_CHECK}"
          if [ "${BRANCH_CHECK}" = "200" ]; then
-            BRANCH_EXISTS="true"
-          else
-            BRANCH_EXISTS="false"
+            echo "Deleting existing next-release branch..."
+            curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X DELETE \
+              -H "Authorization: token ${TOKEN}" \
+              "${API_URL}/branches/next-release"
+            echo "Branch deleted"
          fi
-          echo "Branch exists: ${BRANCH_EXISTS}"

          # Prepare CHANGELOG.md content
          CHANGELOG_CONTENT=$(base64 -w0 < CHANGELOG.md)
@@ -135,162 +118,123 @@ jobs:
          VERSION_JSON=$(jq -n --arg v "${VERSION}" '{"version":$v}')
          VERSION_CONTENT=$(echo "${VERSION_JSON}" | base64 -w0)

-          if [ "${BRANCH_EXISTS}" = "true" ]; then
-            echo "Updating existing next-release branch..."
+          echo "Creating new next-release branch from ${BASE_BRANCH}..."

-            # Get SHA of existing CHANGELOG.md
-            CHANGELOG_SHA=$(curl -sf --retry 3 --retry-delay 2 --retry-connrefused \
-              -H "Authorization: token ${TOKEN}" \
-              "${API_URL}/contents/CHANGELOG.md?ref=next-release" | jq -r '.sha // empty')
+          # Check if CHANGELOG.md exists on base branch to determine create vs update
+          CHANGELOG_SHA=$(curl -sf --retry 3 --retry-delay 2 --retry-connrefused \
+            -H "Authorization: token ${TOKEN}" \
+            "${API_URL}/contents/CHANGELOG.md?ref=${BASE_BRANCH}" | jq -r '.sha // empty')

-            # Update or create CHANGELOG.md
-            if [ -n "${CHANGELOG_SHA}" ]; then
-              curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X PUT \
-                -H "Authorization: token ${TOKEN}" \
-                -H "Content-Type: application/json" \
-                --data "$(jq -n \
-                  --arg content "${CHANGELOG_CONTENT}" \
-                  --arg sha "${CHANGELOG_SHA}" \
-                  --arg message "${TITLE}" \
-                  --arg branch "next-release" \
-                  '{content: $content, sha: $sha, message: $message, branch: $branch}')" \
-                "${API_URL}/contents/CHANGELOG.md"
-            else
-              curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X POST \
-                -H "Authorization: token ${TOKEN}" \
-                -H "Content-Type: application/json" \
-                --data "$(jq -n \
-                  --arg content "${CHANGELOG_CONTENT}" \
-                  --arg message "${TITLE}" \
-                  --arg branch "next-release" \
-                  '{content: $content, message: $message, branch: $branch, new_branch: $branch}')" \
-                "${API_URL}/contents/CHANGELOG.md"
-            fi
-
-            # Get SHA of existing .version
-            VERSION_SHA=$(curl -sf --retry 3 --retry-delay 2 --retry-connrefused \
-              -H "Authorization: token ${TOKEN}" \
-              "${API_URL}/contents/.version?ref=next-release" | jq -r '.sha // empty')
-
-            # Update or create .version
-            if [ -n "${VERSION_SHA}" ]; then
-              curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X PUT \
-                -H "Authorization: token ${TOKEN}" \
-                -H "Content-Type: application/json" \
-                --data "$(jq -n \
-                  --arg content "${VERSION_CONTENT}" \
-                  --arg sha "${VERSION_SHA}" \
-                  --arg message "${TITLE}" \
-                  --arg branch "next-release" \
-                  '{content: $content, sha: $sha, message: $message, branch: $branch}')" \
-                "${API_URL}/contents/.version"
-            else
-              curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X POST \
-                -H "Authorization: token ${TOKEN}" \
-                -H "Content-Type: application/json" \
-                --data "$(jq -n \
-                  --arg content "${VERSION_CONTENT}" \
-                  --arg message "${TITLE}" \
-                  --arg branch "next-release" \
-                  '{content: $content, message: $message, branch: $branch}')" \
-                "${API_URL}/contents/.version"
-            fi
-          else
-            echo "Creating new next-release branch from ${BASE_BRANCH}..."
-
-            # Check if CHANGELOG.md exists on base branch to determine create vs update
-            CHANGELOG_SHA=$(curl -sf --retry 3 --retry-delay 2 --retry-connrefused \
-              -H "Authorization: token ${TOKEN}" \
-              "${API_URL}/contents/CHANGELOG.md?ref=${BASE_BRANCH}" | jq -r '.sha // empty')
-
-            if [ -n "${CHANGELOG_SHA}" ]; then
-              echo "Updating CHANGELOG.md (exists on ${BASE_BRANCH}) on new branch..."
-              RESPONSE=$(curl -s --retry 3 --retry-delay 2 --retry-connrefused -w "\n%{http_code}" -X PUT \
-                -H "Authorization: token ${TOKEN}" \
-                -H "Content-Type: application/json" \
-                --data "$(jq -n \
-                  --arg content "${CHANGELOG_CONTENT}" \
-                  --arg sha "${CHANGELOG_SHA}" \
-                  --arg message "${TITLE}" \
-                  --arg branch "${BASE_BRANCH}" \
-                  --arg new_branch "next-release" \
-                  '{content: $content, sha: $sha, message: $message, branch: $branch, new_branch: $new_branch}')" \
-                "${API_URL}/contents/CHANGELOG.md")
-            else
-              echo "Creating CHANGELOG.md on new branch..."
-              RESPONSE=$(curl -s --retry 3 --retry-delay 2 --retry-connrefused -w "\n%{http_code}" -X POST \
-                -H "Authorization: token ${TOKEN}" \
-                -H "Content-Type: application/json" \
-                --data "$(jq -n \
-                  --arg content "${CHANGELOG_CONTENT}" \
-                  --arg message "${TITLE}" \
-                  --arg branch "${BASE_BRANCH}" \
-                  --arg new_branch "next-release" \
-                  '{content: $content, message: $message, branch: $branch, new_branch: $new_branch}')" \
-                "${API_URL}/contents/CHANGELOG.md")
-            fi
-            HTTP_CODE=$(echo "${RESPONSE}" | tail -1)
-            BODY=$(echo "${RESPONSE}" | sed '$d')
-            if [ "${HTTP_CODE}" -ge 400 ]; then
-              echo "Error with CHANGELOG.md: ${BODY}"
-              exit 1
-            fi
-
-            # Check if .version exists on base branch
-            VERSION_SHA=$(curl -sf --retry 3 --retry-delay 2 --retry-connrefused \
-              -H "Authorization: token ${TOKEN}" \
-              "${API_URL}/contents/.version?ref=${BASE_BRANCH}" | jq -r '.sha // empty')
-
-            if [ -n "${VERSION_SHA}" ]; then
-              echo "Updating .version on next-release branch..."
-              curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X PUT \
-                -H "Authorization: token ${TOKEN}" \
-                -H "Content-Type: application/json" \
-                --data "$(jq -n \
-                  --arg content "${VERSION_CONTENT}" \
-                  --arg sha "${VERSION_SHA}" \
-                  --arg message "${TITLE}" \
-                  --arg branch "next-release" \
-                  '{content: $content, sha: $sha, message: $message, branch: $branch}')" \
-                "${API_URL}/contents/.version"
-            else
-              echo "Creating .version on next-release branch..."
-              curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X POST \
-                -H "Authorization: token ${TOKEN}" \
-                -H "Content-Type: application/json" \
-                --data "$(jq -n \
-                  --arg content "${VERSION_CONTENT}" \
-                  --arg message "${TITLE}" \
-                  --arg branch "next-release" \
-                  '{content: $content, message: $message, branch: $branch}')" \
-                "${API_URL}/contents/.version"
-            fi
-          fi
-
-          if [ -n "${PR_INDEX}" ]; then
-            echo "Updating existing PR #${PR_INDEX}..."
-            curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X PATCH \
+          if [ -n "${CHANGELOG_SHA}" ]; then
+            echo "Updating CHANGELOG.md (exists on ${BASE_BRANCH}) on new branch..."
+            RESPONSE=$(curl -s --retry 3 --retry-delay 2 --retry-connrefused -w "\n%{http_code}" -X PUT \
              -H "Authorization: token ${TOKEN}" \
              -H "Content-Type: application/json" \
              --data "$(jq -n \
-                --arg title "${TITLE}" \
-                --arg body "${DESCRIPTION}" \
-                '{title: $title, body: $body}')" \
-              "${API_URL}/pulls/${PR_INDEX}"
+                --arg content "${CHANGELOG_CONTENT}" \
+                --arg sha "${CHANGELOG_SHA}" \
+                --arg message "${TITLE}" \
+                --arg branch "${BASE_BRANCH}" \
+                --arg new_branch "next-release" \
+                '{content: $content, sha: $sha, message: $message, branch: $branch, new_branch: $new_branch}')" \
+              "${API_URL}/contents/CHANGELOG.md")
          else
-            echo "Creating new PR..."
+            echo "Creating CHANGELOG.md on new branch..."
+            RESPONSE=$(curl -s --retry 3 --retry-delay 2 --retry-connrefused -w "\n%{http_code}" -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/json" \
+              --data "$(jq -n \
+                --arg content "${CHANGELOG_CONTENT}" \
+                --arg message "${TITLE}" \
+                --arg branch "${BASE_BRANCH}" \
+                --arg new_branch "next-release" \
+                '{content: $content, message: $message, branch: $branch, new_branch: $new_branch}')" \
+              "${API_URL}/contents/CHANGELOG.md")
+          fi
+          HTTP_CODE=$(echo "${RESPONSE}" | tail -1)
+          BODY=$(echo "${RESPONSE}" | sed '$d')
+          if [ "${HTTP_CODE}" -ge 400 ]; then
+            echo "Error with CHANGELOG.md: ${BODY}"
+            exit 1
+          fi
+
+          # Check if .version exists on base branch
+          VERSION_SHA=$(curl -sf --retry 3 --retry-delay 2 --retry-connrefused \
+            -H "Authorization: token ${TOKEN}" \
+            "${API_URL}/contents/.version?ref=${BASE_BRANCH}" | jq -r '.sha // empty')
+
+          if [ -n "${VERSION_SHA}" ]; then
+            echo "Updating .version on next-release branch..."
+            curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X PUT \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/json" \
+              --data "$(jq -n \
+                --arg content "${VERSION_CONTENT}" \
+                --arg sha "${VERSION_SHA}" \
+                --arg message "${TITLE}" \
+                --arg branch "next-release" \
+                '{content: $content, sha: $sha, message: $message, branch: $branch}')" \
+              "${API_URL}/contents/.version"
+          else
+            echo "Creating .version on next-release branch..."
            curl -sf --retry 3 --retry-delay 2 --retry-connrefused -X POST \
              -H "Authorization: token ${TOKEN}" \
              -H "Content-Type: application/json" \
              --data "$(jq -n \
-                --arg title "${TITLE}" \
-                --arg body "${DESCRIPTION}" \
-                --arg head "next-release" \
-                --arg base "${DEFAULT_BRANCH}" \
-                '{title: $title, body: $body, head: $head, base: $base}')" \
-              "${API_URL}/pulls"
+                --arg content "${VERSION_CONTENT}" \
+                --arg message "${TITLE}" \
+                --arg branch "next-release" \
+                '{content: $content, message: $message, branch: $branch}')" \
+              "${API_URL}/contents/.version"
          fi

+          echo "Creating new PR..."
+          echo "Waiting for next-release branch to be ready..."
+          for i in $(seq 1 10); do
+            BRANCH_STATUS=$(curl -s --retry 3 --retry-delay 2 --retry-connrefused \
+              -w "%{http_code}" -o /dev/null \
+              -H "Authorization: token ${TOKEN}" \
+              "${API_URL}/branches/next-release")
+            if [ "${BRANCH_STATUS}" = "200" ]; then
+              echo "Branch ready after ${i} attempt(s)"
+              break
+            fi
+            if [ "${i}" = "10" ]; then
+              echo "Branch next-release not found after 10 attempts, giving up"
+              exit 1
+            fi
+            echo "Branch not ready yet (attempt ${i}/10), waiting..."
+            sleep 3
+          done
+
+          PR_DATA=$(jq -n \
+            --arg title "${TITLE}" \
+            --arg body "${DESCRIPTION}" \
+            --arg head "next-release" \
+            --arg base "${BASE_BRANCH}" \
+            '{title: $title, body: $body, head: $head, base: $base}')
+
+          for i in $(seq 1 5); do
+            RESPONSE=$(curl -s --retry 3 --retry-delay 2 --retry-connrefused \
+              -w "\n%{http_code}" -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/json" \
+              --data "${PR_DATA}" \
+              "${API_URL}/pulls")
+            HTTP_CODE=$(echo "${RESPONSE}" | tail -1)
+            BODY=$(echo "${RESPONSE}" | sed '$d')
+            if [ "${HTTP_CODE}" -lt 400 ]; then
+              echo "PR created successfully"
+              break
+            fi
+            if [ "${i}" = "5" ]; then
+              echo "Error creating PR after 5 attempts (HTTP ${HTTP_CODE}): ${BODY}"
+              exit 1
+            fi
+            echo "PR creation attempt ${i}/5 failed (HTTP ${HTTP_CODE}), retrying..."
+            sleep 3
+          done
+
  create-release:
    name: Create Release
    runs-on: ubuntu-latest
Author	SHA1	Message	Date
argoyle	e3c17ceaa0	fix: make release PR creation robust against race conditions (#19 ) Two fixes for intermittent release workflow failures: - Use `BASE_BRANCH` instead of `DEFAULT_BRANCH` for the PR `base` field — `BASE_BRANCH` has a `:-main` fallback, preventing an empty base from causing a 404 - Replace fixed `sleep 3` with proper polling and retry — polls for branch readiness (up to 10 attempts) before creating the PR, then retries PR creation (up to 5 attempts) with backoff Fixes the `Error creating PR (HTTP 404)` seen when Gitea hasn't fully indexed the `next-release` branch by the time the PR creation request fires. 🤖 Generated with [Claude Code](https://claude.ai/claude-code) Reviewed-on: #19	2026-03-23 15:52:25 +00:00
argoyle	068c6ef686	Merge pull request 'fix(release): add retry and delay for PR creation to handle Gitea API race condition' (#18 ) from fix-release-pr-race-condition into main Reviewed-on: #18	2026-02-23 13:13:23 +00:00
argoyle	d5623bdf9c	fix(release): add retry and delay for PR creation to handle Gitea API race condition The PR creation curl immediately follows branch creation via the Contents API, but Gitea may not have fully indexed the new branch for pull request operations yet. This causes intermittent HTTP errors on the first run. - Add sleep 3 before PR creation to allow Gitea to process the new branch - Use --retry-all-errors so curl retries on HTTP 4xx/5xx (not just connection failures) - Capture and display the actual HTTP error code and response body on failure for easier debugging Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-23 14:12:43 +01:00
argoyle	e3f1ba4e0a	Merge pull request 'fix(release): replace rebase with branch recreation to prevent PR merge conflicts' (#17 ) from fix-release-pr-conflicts into main Reviewed-on: #17	2026-02-12 11:02:43 +00:00
argoyle	4688810928	fix(release): replace rebase with branch recreation to prevent PR merge conflicts Delete and recreate the next-release branch from base on each run instead of rebasing, which caused 409 conflicts on CHANGELOG.md. Add concurrency group to prevent parallel workflow runs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-12 12:02:01 +01:00