From 046422b11124ae6d551c34fce4f444ea28dd422f Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 21 Feb 2024 14:30:23 +0100 Subject: [PATCH] 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). --- .github/workflows/auto-release.yml | 1 + .github/workflows/release.yml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 26b6f695069f..9526e93d55c6 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -36,3 +36,4 @@ jobs: version: ${{ steps.version.outputs.group1 }} force: false merge_target: master + craft_config_from_merge_target: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cf4561746bb4..e55d7b9470fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 +