fix(ci): changelog job creates release, eliminating race with build jobs #56

Merged
sarman merged 2 commits from fix/auto-tag-changelog-race into master 2026-05-31 21:13:12 +00:00

View File

@ -128,6 +128,13 @@ jobs:
# Use the tag output from autotag — never rely on git describe # Use the tag output from autotag — never rely on git describe
CURRENT_TAG="${RELEASE_TAG}" CURRENT_TAG="${RELEASE_TAG}"
echo "Building changelog for $CURRENT_TAG" echo "Building changelog for $CURRENT_TAG"
# Verify the tag is present locally after fetch before running git-cliff
if ! git rev-parse "refs/tags/${CURRENT_TAG}" >/dev/null 2>&1; then
echo "ERROR: tag ${CURRENT_TAG} not found locally after fetch"
exit 1
fi
git-cliff --config cliff.toml --output CHANGELOG.md git-cliff --config cliff.toml --output CHANGELOG.md
PREV_TAG=$(git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' \ PREV_TAG=$(git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' \
| grep -v "^${CURRENT_TAG}$" | head -1 || echo "") | grep -v "^${CURRENT_TAG}$" | head -1 || echo "")
@ -140,7 +147,7 @@ jobs:
echo "=== Release body preview ===" echo "=== Release body preview ==="
cat /tmp/release_body.md cat /tmp/release_body.md
- name: Update Gitea release body - name: Create or update Gitea release
env: env:
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }} RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
RELEASE_TAG: ${{ needs.autotag.outputs.release_tag }} RELEASE_TAG: ${{ needs.autotag.outputs.release_tag }}
@ -148,18 +155,43 @@ jobs:
set -eu set -eu
TAG="${RELEASE_TAG}" TAG="${RELEASE_TAG}"
API="http://172.0.0.29:3000/api/v1/repos/$GITHUB_REPOSITORY" API="http://172.0.0.29:3000/api/v1/repos/$GITHUB_REPOSITORY"
RELEASE_ID=$(curl -sf "$API/releases/tags/$TAG" \ RELEASE_BODY=$(cat /tmp/release_body.md)
-H "Authorization: token $RELEASE_TOKEN" | jq -r '.id')
if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then # Try to find an existing release for this tag
echo "ERROR: Could not find release for tag $TAG" RELEASE_ID=$(curl -s "$API/releases/tags/$TAG" \
exit 1 -H "Authorization: token $RELEASE_TOKEN" | jq -r '.id // empty')
fi
BODY=$(jq -n --rawfile note /tmp/release_body.md '{body: $note}') if [ -z "$RELEASE_ID" ]; then
curl -sf -X PATCH "$API/releases/$RELEASE_ID" \ # Release doesn't exist yet — create it with the changelog body.
# Build jobs run in parallel and rely on the release existing;
# creating it here ensures no race condition.
echo "Creating release $TAG..."
RELEASE_ID=$(jq -n \
--arg tag "$TAG" \
--arg name "TFTSR $TAG" \
--rawfile body /tmp/release_body.md \
'{tag_name: $tag, name: $name, body: $body, draft: false}' \
| curl -sf -X POST "$API/releases" \
-H "Authorization: token $RELEASE_TOKEN" \ -H "Authorization: token $RELEASE_TOKEN" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d "$BODY" --data @- \
| jq -r '.id')
echo "✓ Release created (id=$RELEASE_ID)"
else
# Release already exists (e.g. re-run) — patch the body only
echo "Updating existing release $TAG (id=$RELEASE_ID)..."
jq -n --rawfile body /tmp/release_body.md '{body: $body}' \
| curl -sf -X PATCH "$API/releases/$RELEASE_ID" \
-H "Authorization: token $RELEASE_TOKEN" \
-H "Content-Type: application/json" \
--data @-
echo "✓ Release body updated" echo "✓ Release body updated"
fi
if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
echo "ERROR: Failed to create or locate release for $TAG"
exit 1
fi
- name: Commit CHANGELOG.md to master - name: Commit CHANGELOG.md to master
env: env: