Skip to content

release.sh: drop [skip ci] from version bump; allow manual tag_on_main #686

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

Open
bjorkert wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

release.sh: drop [skip ci] from version bump; allow manual tag_on_main #686

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
4 changes: 4 additions & 0 deletions .github/workflows/tag_on_main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ on:
push:
branches:
- main
# Manual fallback: if the push-triggered run was ever skipped (e.g. a commit
# with [skip ci] landing on main), the tag can be created by dispatching this
# workflow against main. It is idempotent — it skips if the tag already exists.
workflow_dispatch:

jobs:
tag:
Expand Down
5 changes: 4 additions & 1 deletion release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ echo_run git switch -c "$RELEASE_BRANCH"
# --- bump version on the release branch ----
sed -i '' "s/${MARKETING_KEY}[[:space:]]*=.*/${MARKETING_KEY} = ${new_ver}/" "$VERSION_FILE"
echo_run git diff "$VERSION_FILE"; pause
echo_run git commit -m "update version to ${new_ver} [skip ci]" "$VERSION_FILE"
# No [skip ci] here on purpose: it would skip the required SwiftFormat lint check
# (leaving the release PRs blocked) and the tag_on_main workflow (no auto-tag).
# auto_version_dev already avoids re-bumping via its "Config.xcconfig changed" guard.
echo_run git commit -m "update version to ${new_ver}" "$VERSION_FILE"

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