Repository navigation
chore(automation): merge changelogs PR when draft release is created - #2540
Merged
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
r0b1n
force-pushed
the
r0b1n/release-process
branch
from
November 18, 2026 14:32
d4ff84c to
e45ac4d
Compare
Contributor
AI Code Review
What was reviewed
Skipped (out of scope): none. CI: pending: sigridci, code/snyk · unrelated failures: security/snyk (this PR changes no dependencies or app code) Positives
|
leonardomendix
approved these changes
Nov 18, 2026
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull request type
No code changes (changes to documentation, CI, metadata, etc.)
Why
We never adjust a release once its draft is ready, yet the version bump / changelog PR stays open until Marketplace publish, which is days later because of OSS clearance. Meanwhile
mainhas the old version and other PRs can conflict with the bump.What changed
Create draft releasenow merges the changelogs PR right after the draft is created, before OSS clearance.rui-merge-changelogs-prfinds the PR by head branch (tmp/<tag>, then<tag>-update-changelog). A draft release has no git tag yet, so the old tag lookup returns 404 at that point. The tag lookup stays as a fallback.CHANGELOG.md,package.json,package.xml) stays. The script retries HTTP 405 (mergeability not computed yet for a just-opened PR) up to 6 times, 10s apart.release-widgetskill checks the PR is merged before OSS clearance.Scope
automation/utils,CreateGitHubRelease.yml,PublishMarketplace.yml,release-widgetskill. No widget or shared package changes, so no changelog.Tradeoffs
mainhas no required status check, the checks are meaningless for a metadata-only PR, and flaky tests would leave a release stuck. GitHub auto-merge was rejected for the same reason.mainalready carries the version and its changelog section, so the same version can't be re-cut. The skill says to release the next patch instead. Re-cutting would need extra logic inrui-bump-versionand the changelog update, which isn't worth it for a rare case.Blast radius
None outside the release automation. The change is safe because of these facts:
tooltip-web-v1.6.0:release-widgetskill runs the workflow ontmp/<tag>.rui-prepare-releasetriggers it on its own branch, whichrui-create-gh-releaseturns into<tag>-update-changelog. The lookup tries both names.tmp/data-widgets-v3.11.9→ Data Widgets v3.11.9: Update changelog #2510, closed).getPRByReleaseTagandmergePRare only used byrui-merge-changelogs-pr.MergePRErrorextendsError, so existing handling is unchanged.Verification
automation/utils:tsc --noEmit, lint (no new warnings) andpnpm run test(16/16) pass.data-widgets-v3.11.9for the currentdata-widgets.Create draft releasefinishes, thetmp/<tag>PR should be merged andmainshould carry the new version before OSS clearance is requested.