From 7497d0366161ed6c228231acd89bec666f9fc986 Mon Sep 17 00:00:00 2001 From: Lars Kemper Date: Mon, 20 Apr 2026 07:58:05 +0200 Subject: [PATCH] ci: use release branches --- .../actions/setup-magento-plugin/action.yml | 19 ++++++++++++++++++- composer.json | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-magento-plugin/action.yml b/.github/actions/setup-magento-plugin/action.yml index 5ea3af61..a8d08c99 100644 --- a/.github/actions/setup-magento-plugin/action.yml +++ b/.github/actions/setup-magento-plugin/action.yml @@ -18,10 +18,26 @@ inputs: default: "trunk" required: false description: "Which Shopware version should be used" + assistant-branch: + default: "" + required: false + description: "Which SwagMigrationAssistant branch to use. Defaults to the latest release (release/)." runs: using: composite steps: + - name: Resolve SwagMigrationAssistant branch + shell: bash + run: | + if [ -n "${{ inputs.assistant-branch }}" ]; then + echo "ASSISTANT_BRANCH=${{ inputs.assistant-branch }}" >> $GITHUB_ENV + else + VERSION=$(gh api repos/shopware/SwagMigrationAssistant/releases/latest --jq '.tag_name') + echo "ASSISTANT_BRANCH=release/${VERSION}" >> $GITHUB_ENV + fi + env: + GH_TOKEN: ${{ github.token }} + - name: Setup SwagMigrationMagento uses: shopware/github-actions/setup-extension@main with: @@ -48,6 +64,7 @@ runs: [ { "name": "SwagMigrationAssistant", - "repo": "https://github.com/shopware/SwagMigrationAssistant.git" + "repo": "https://github.com/shopware/SwagMigrationAssistant.git", + "branch": "${ASSISTANT_BRANCH}" } ] diff --git a/composer.json b/composer.json index 823dfac2..e530e858 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "shopware/core": "~6.7", - "swag/migration-assistant": "~16.1" + "swag/migration-assistant": "~16.2" }, "extra": { "shopware-plugin-class": "Swag\\MigrationMagento\\SwagMigrationMagento",