Skip to content

Commit 01e0786

Browse files
authored
release.sh: drop [skip ci] from version bump; allow manual tag_on_main (#686)
The [skip ci] on the version-bump commit skipped the required SwiftFormat lint check (blocking the release PRs) and the tag_on_main workflow (no auto-tag). Remove it; auto_version_dev already prevents re-bumping via its Config.xcconfig guard. Also add a workflow_dispatch trigger to tag_on_main so the tag can be created manually if a run is ever skipped.
1 parent c3391b5 commit 01e0786

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

.github/workflows/tag_on_main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on:
1717
push:
1818
branches:
1919
- main
20+
# Manual fallback: if the push-triggered run was ever skipped (e.g. a commit
21+
# with [skip ci] landing on main), the tag can be created by dispatching this
22+
# workflow against main. It is idempotent — it skips if the tag already exists.
23+
workflow_dispatch:
2024

2125
jobs:
2226
tag:

release.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ echo_run git switch -c "$RELEASE_BRANCH"
116116
# --- bump version on the release branch ----
117117
sed -i '' "s/${MARKETING_KEY}[[:space:]]*=.*/${MARKETING_KEY} = ${new_ver}/" "$VERSION_FILE"
118118
echo_run git diff "$VERSION_FILE"; pause
119-
echo_run git commit -m "update version to ${new_ver} [skip ci]" "$VERSION_FILE"
119+
# No [skip ci] here on purpose: it would skip the required SwiftFormat lint check
120+
# (leaving the release PRs blocked) and the tag_on_main workflow (no auto-tag).
121+
# auto_version_dev already avoids re-bumping via its "Config.xcconfig changed" guard.
122+
echo_run git commit -m "update version to ${new_ver}" "$VERSION_FILE"
120123

121124
echo "💻 Build & test release branch now."; pause
122125
queue_push push origin "$RELEASE_BRANCH"

0 commit comments

Comments
 (0)