From a6a5988c7f6a94ef6365912104238d97336ebd07 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 21 Feb 2024 11:16:10 +0100 Subject: [PATCH 1/2] chore(publish): Use craft config from merge target branch for release creation --- .github/workflows/auto-release.yml | 1 + .github/workflows/release.yml | 2 ++ 2 files changed, 3 insertions(+) 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..7f36bdbedc05 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 + From 04ac0ceeb247de60d0cc45a095a88e1d2da186f5 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Wed, 21 Feb 2024 11:52:02 +0100 Subject: [PATCH 2/2] change default merge target to v7 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f36bdbedc05..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