Skip to content

fix(release): preserve annotated tag during checkout #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ygsgdbd merged 1 commit into from
Sep 2, 2026
Merged

fix(release): preserve annotated tag during checkout #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ jobs:
with:
fetch-depth: 0

- name: Restore annotated release tag
env:
RELEASE_TAG: ${{ github.ref_name }}
run: git fetch --force origin "refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}"

- name: Validate release tag
id: release_tag
env:
Expand Down
8 changes: 6 additions & 2 deletions script/test_release_scripts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ JOB_NAMES=$(awk '
assert_contains "$WORKFLOW" 'group: release-${{ github.repository }}'
assert_contains "$WORKFLOW" 'cancel-in-progress: false'
assert_not_contains "$WORKFLOW" 'queue:'
assert_contains "$WORKFLOW" 'git fetch --force origin "refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}"'
assert_contains "$WORKFLOW" "git tag --merged origin/main --list 'v*'"
assert_contains "$WORKFLOW" 'ruby script/validate_release_order.rb "$RELEASE_TAG"'
assert_contains "$WORKFLOW" 'script/ensure_release_absent.sh "$GITHUB_REPOSITORY" "$RELEASE_TAG"'
Expand All @@ -294,11 +295,14 @@ assert_not_contains "$WORKFLOW" 'release-notes.html'
[[ "$(grep -Fc 'secrets.HOMEBREW_TAP_TOKEN' "$WORKFLOW")" == "1" ]] || fail "Homebrew token must appear only in the tap checkout."
[[ ! -e "${ROOT_DIR}/script/validate_release_version.rb" ]] || fail "Obsolete release version helper still exists."

RESTORE_TAG_LINE=$(grep -nF -- 'name: Restore annotated release tag' "$WORKFLOW" | cut -d: -f1)
VALIDATE_TAG_LINE=$(grep -nF -- 'name: Validate release tag' "$WORKFLOW" | cut -d: -f1)
RELEASE_ABSENT_LINE=$(grep -nF -- 'name: Ensure GitHub Release does not already exist' "$WORKFLOW" | cut -d: -f1)
GENERATE_PROJECT_LINE=$(grep -nF -- 'name: Generate Xcode Project' "$WORKFLOW" | cut -d: -f1)
if (( VALIDATE_TAG_LINE >= RELEASE_ABSENT_LINE || RELEASE_ABSENT_LINE >= GENERATE_PROJECT_LINE )); then
fail "GitHub Release absence check must run after tag validation and before project generation."
if (( RESTORE_TAG_LINE >= VALIDATE_TAG_LINE
|| VALIDATE_TAG_LINE >= RELEASE_ABSENT_LINE
|| RELEASE_ABSENT_LINE >= GENERATE_PROJECT_LINE )); then
fail "Annotated tag restore and release absence checks must run before project generation."
fi

assert_contains "$PR_WORKFLOW" 'release-scripts:'
Expand Down
Loading