From 3d23e5bf24bcd29d9ad0a5151385b61ccc461f8b Mon Sep 17 00:00:00 2001 From: Lars Kemper Date: Tue, 12 May 2026 09:11:00 +0200 Subject: [PATCH 1/3] ci: test --- .github/actions/setup-magento-plugin/action.yml | 5 +++++ .github/workflows/action-phpunit.yml | 2 ++ .github/workflows/integration.yml | 2 +- tests/TestBootstrap.php | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-magento-plugin/action.yml b/.github/actions/setup-magento-plugin/action.yml index a8d08c99..a0ec84ce 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 1c572bc8..cbb73fba 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 f1529bab..af2b8663 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: fix/phpunit-bootstrap-plugin-install diff --git a/tests/TestBootstrap.php b/tests/TestBootstrap.php index fbe4d5ca..8000f508 100644 --- a/tests/TestBootstrap.php +++ b/tests/TestBootstrap.php @@ -17,6 +17,7 @@ exit('Could not find TestBootstrapper.php'); } +// test return (new TestBootstrapper()) ->setProjectDir($_SERVER['PROJECT_ROOT'] ?? dirname(__DIR__, 4)) ->setLoadEnvFile(true) From 17a2394b57cd879191add2a5b3b45e66e9d12f13 Mon Sep 17 00:00:00 2001 From: Lars Kemper Date: Tue, 12 May 2026 10:28:16 +0200 Subject: [PATCH 2/3] ci: pin shopware bootstrap fix ref --- .github/workflows/integration.yml | 2 +- tests/TestBootstrap.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index af2b8663..78b26f23 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: fix/phpunit-bootstrap-plugin-install + platform_branch: 8fdfe5edf090d6ec249f5750377a38e77c8d93bf diff --git a/tests/TestBootstrap.php b/tests/TestBootstrap.php index 8000f508..fbe4d5ca 100644 --- a/tests/TestBootstrap.php +++ b/tests/TestBootstrap.php @@ -17,7 +17,6 @@ exit('Could not find TestBootstrapper.php'); } -// test return (new TestBootstrapper()) ->setProjectDir($_SERVER['PROJECT_ROOT'] ?? dirname(__DIR__, 4)) ->setLoadEnvFile(true) From cd290c33fb387303baa888d04634ebb6e4dce9b7 Mon Sep 17 00:00:00 2001 From: Lars Kemper Date: Tue, 12 May 2026 11:06:11 +0200 Subject: [PATCH 3/3] ci: test shopware non-interactive bootstrap fix --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 78b26f23..ea34450c 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: 8fdfe5edf090d6ec249f5750377a38e77c8d93bf + platform_branch: 12c6c71cdbcc1600107aa79686c91479f40b895c