You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit d4ff84c
Browse filesBrowse the repository at this point in the historyBrowse files
chore(automation): merge changelogs PR when draft release is created
Merge the version bump/changelog PR right after the draft release is
created instead of after Marketplace publish, so main gets the new
version before OSS clearance starts. The PR is looked up by its head
branch (draft releases have no git tag yet) and merged without waiting
for checks. The publish-time merge step stays as a no-op fallback.
Copy file name to clipboardExpand all lines: .agents/skills/release-widget/SKILL.md
+11-7Lines changed: 11 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -143,6 +143,16 @@ Keep `--branch`: without it, `-L 1` returns the newest run on _any_ branch.
143
143
144
144
Wait (re-poll, don't ask the user to check) until `status == completed`. Report the conclusion and the draft release URL.
145
145
146
+
The workflow's last step (`Merge changelogs PR`) merges the changelog/version-bump PR into `main` right away — without waiting for PR checks, after verifying it only touches `CHANGELOG.md`/`package.json`/`package.xml`. Confirm before moving on to OSS clearance:
147
+
148
+
```bash
149
+
gh pr list --head "tmp/<release-tag>" --state all --json number,state,url
150
+
```
151
+
152
+
Expect `MERGED`. Still `OPEN` → read that step's log (`gh run view <databaseId> --log | grep -A20 "Merge changelogs PR"`): unexpected files or a merge conflict with `main`. Report it — merging by hand is the user's job (branch protection).
153
+
154
+
**Abandoned draft:**`main` already carries `<version>` and its changelog section, so the same version can't be re-cut (`rui-bump-version` requires a greater version, and the changelog has no unreleased entries left). Release the next patch instead.
@@ -197,13 +207,7 @@ Find the run matching this tag/branch.
197
207
198
208
- `conclusion: success` → doesn't mean the version is live yet. Confirm: `marketplace-mcp`'s `get_content_versions` with `contentId` = `appNumber` from Phase 0, check `<version>` is listed. If `marketplace-mcp` isn't connected or errors, ask the user to check the widget's Marketplace listing page for`<version>`. Don't declare done until one of the two confirms it.
199
209
200
-
Then verify changelog PR merged:
201
-
202
-
```bash
203
-
gh pr list --head "tmp/<release-tag>" --json number,state
204
-
```
205
-
206
-
Still open after successful publish → check whether `merge-changelogs-pr` step ran. Don't merge it yourself: branch protection requires team approvals — tell the user it's on them.
210
+
The changelog PR should already be merged since Phase 3; `PublishMarketplace.yml` retries the merge as a fallback. If it's still open, tell the user — don't merge it yourself (branch protection).
207
211
208
212
- `conclusion: failure` → **check run history before escalating**:
0 commit comments