Skip to content

Commit

Permalink
chore(publish): [v7] Use craft config from merge target branch for re…
Browse files Browse the repository at this point in the history
…lease 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).
  • Loading branch information
Lms24 committed Feb 21, 2024
1 parent 4de88db commit 046422b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ jobs:
version: ${{ steps.version.outputs.group1 }}
force: false
merge_target: master
craft_config_from_merge_target: true
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
merge_target:
description: Target branch to merge into. Uses the default branch as a fallback (optional)
required: false
default: master
default: v7
jobs:
release:
runs-on: ubuntu-20.04
Expand All @@ -29,3 +29,5 @@ jobs:
version: ${{ github.event.inputs.version }}
force: ${{ github.event.inputs.force }}
merge_target: ${{ github.event.inputs.merge_target }}
craft_config_from_merge_target: true

0 comments on commit 046422b

Please sign in to comment.