Skip to content

Commit 046422b

Browse files
authored
chore(publish): [v7] Use craft config from merge target branch for release preparation (#10763)
Update our prepare release workflows on the `v7` branch to use the craft config from the merge target branch (which for v7 releases should always be `v7`) instead of the config from the default branch (`develop` in our case).
1 parent 4de88db commit 046422b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/auto-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ jobs:
3636
version: ${{ steps.version.outputs.group1 }}
3737
force: false
3838
merge_target: master
39+
craft_config_from_merge_target: true

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
merge_target:
1212
description: Target branch to merge into. Uses the default branch as a fallback (optional)
1313
required: false
14-
default: master
14+
default: v7
1515
jobs:
1616
release:
1717
runs-on: ubuntu-20.04
@@ -29,3 +29,5 @@ jobs:
2929
version: ${{ github.event.inputs.version }}
3030
force: ${{ github.event.inputs.force }}
3131
merge_target: ${{ github.event.inputs.merge_target }}
32+
craft_config_from_merge_target: true
33+

0 commit comments

Comments
 (0)