diff --git a/.github/actions/setup-magento-plugin/action.yml b/.github/actions/setup-magento-plugin/action.yml index a8d08c9..a0ec84c 100644 --- a/.github/actions/setup-magento-plugin/action.yml +++ b/.github/actions/setup-magento-plugin/action.yml @@ -14,6 +14,10 @@ inputs: default: "builtin" required: false description: "Which MySQL version should be used" + extension-ref: + default: "" + required: false + description: "Which SwagMigrationMagento ref should be used" platform-branch: default: "trunk" required: false @@ -42,6 +46,7 @@ runs: uses: shopware/github-actions/setup-extension@main with: extensionName: SwagMigrationMagento + extensionRef: ${{ inputs.extension-ref }} install: true install-admin: true shopwareVersion: ${{ inputs.platform-branch }} diff --git a/.github/workflows/action-phpunit.yml b/.github/workflows/action-phpunit.yml index 1c572bc..cbb73fb 100644 --- a/.github/workflows/action-phpunit.yml +++ b/.github/workflows/action-phpunit.yml @@ -24,6 +24,7 @@ jobs: - name: Checkout SwagMigrationMagento uses: actions/checkout@v4 with: + ref: ${{ github.event.pull_request.number && format('refs/pull/{0}/merge', github.event.pull_request.number) || github.sha }} path: custom/plugins/${{ inputs.extension_name }} - name: Setup SwagMigrationMagento @@ -31,6 +32,7 @@ jobs: with: php-version: ${{ matrix.php_version }} mysql-version: ${{ matrix.mysql_image }} + extension-ref: ${{ github.event.pull_request.number && format('refs/pull/{0}/merge', github.event.pull_request.number) || github.sha }} platform-branch: ${{ inputs.platform_branch }} - name: Run PHPUnit diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f1529ba..ea34450 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -34,4 +34,4 @@ jobs: uses: ./.github/workflows/action-phpunit.yml with: extension_name: ${{ github.event.repository.name }} - platform_branch: trunk + platform_branch: 12c6c71cdbcc1600107aa79686c91479f40b895c