Преглед на файлове

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.
Jonas Björkert преди 1 седмица
родител
ревизия
01e078629b
променени са 2 файла, в които са добавени 8 реда и са изтрити 1 реда
  1. 4 0
      .github/workflows/tag_on_main.yml
  2. 4 1
      release.sh

+ 4 - 0
.github/workflows/tag_on_main.yml

@@ -17,6 +17,10 @@ on:
   push:
   push:
     branches:
     branches:
       - main
       - 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:
 jobs:
   tag:
   tag:

+ 4 - 1
release.sh

@@ -116,7 +116,10 @@ echo_run git switch -c "$RELEASE_BRANCH"
 # --- bump version on the release branch ----
 # --- bump version on the release branch ----
 sed -i '' "s/${MARKETING_KEY}[[:space:]]*=.*/${MARKETING_KEY} = ${new_ver}/" "$VERSION_FILE"
 sed -i '' "s/${MARKETING_KEY}[[:space:]]*=.*/${MARKETING_KEY} = ${new_ver}/" "$VERSION_FILE"
 echo_run git diff "$VERSION_FILE"; pause
 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
 echo "💻  Build & test release branch now."; pause
 queue_push push origin "$RELEASE_BRANCH"
 queue_push push origin "$RELEASE_BRANCH"