Skip to content

Commit e037455

Browse files
ci(release): Default merge target to v2 (#3154)
Ensure release runs from the v2 line merge release branches back into v2 instead of falling back to the repository default branch. This avoids post-publish merge conflicts when cutting previous-major releases (e.g. 2.x) while master is on v3. The workflow now sets a v2 default in dispatch inputs and also applies a runtime fallback when invoking action-prepare-release.
1 parent 8e427e8 commit e037455

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ on:
99
description: Force a release even when there are release-blockers (optional)
1010
required: false
1111
merge_target:
12-
description: Target branch to merge into. Uses the default branch as a fallback (optional)
12+
description: Target branch to merge into. Defaults to v2 for this branch
1313
required: false
14+
default: v2
1415
jobs:
1516
release:
1617
runs-on: ubuntu-24.04

0 commit comments

Comments
 (0)