diff --git a/.github/workflows/magento-integration-tests.yml b/.github/workflows/magento-integration-tests.yml index b45c446..10c62d3 100644 --- a/.github/workflows/magento-integration-tests.yml +++ b/.github/workflows/magento-integration-tests.yml @@ -24,9 +24,14 @@ jobs: matrix: include: - PHP_VERSION: php74-fpm - MAGENTO_VERSION: 2.3.7-p4 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.3.7-p4 - PHP_VERSION: php82-fpm - MAGENTO_VERSION: 2.4.6-p12 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.4.6-p12 + - PHP_VERSION: php84-fpm + IMAGE: mage-os-community-edition + IMAGE_VERSION: mage-os3.3.0 steps: - uses: actions/checkout@v5 @@ -34,7 +39,7 @@ jobs: fetch-depth: 0 - name: Start Docker - run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/${{ matrix.IMAGE }}:${{ matrix.PHP_VERSION }}-${{ matrix.IMAGE_VERSION }} - name: Upload our code into the docker container run: docker cp "$(pwd)" magento-project-community-edition:/data/extensions/ diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 9be608a..52d3a44 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -20,9 +20,14 @@ jobs: matrix: include: - PHP_VERSION: php74-fpm - MAGENTO_VERSION: 2.3.7-p4 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.3.7-p4 - PHP_VERSION: php82-fpm - MAGENTO_VERSION: 2.4.6-p12 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.4.6-p12 + - PHP_VERSION: php84-fpm + IMAGE: mage-os-community-edition + IMAGE_VERSION: mage-os3.3.0 permissions: contents: read @@ -34,7 +39,7 @@ jobs: path: module-src - name: Start Docker - run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/${{ matrix.IMAGE }}:${{ matrix.PHP_VERSION }}-${{ matrix.IMAGE_VERSION }} - name: Extract branch name id: extract_branch diff --git a/.github/workflows/release-actions.yml b/.github/workflows/release-actions.yml index b878e3a..6e9b9bb 100644 --- a/.github/workflows/release-actions.yml +++ b/.github/workflows/release-actions.yml @@ -25,9 +25,14 @@ jobs: matrix: include: - PHP_VERSION: php74-fpm - MAGENTO_VERSION: 2.3.7-p4 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.3.7-p4 - PHP_VERSION: php82-fpm - MAGENTO_VERSION: 2.4.6-p12 + IMAGE: magento-project-community-edition + IMAGE_VERSION: magento2.4.6-p12 + - PHP_VERSION: php84-fpm + IMAGE: mage-os-community-edition + IMAGE_VERSION: mage-os3.3.0 steps: - uses: actions/checkout@v5 @@ -35,7 +40,7 @@ jobs: fetch-depth: 0 - name: Start Docker - run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }} + run: docker run --detach --name magento-project-community-edition ghcr.io/controlaltdelete-nl/magento2-in-a-box/${{ matrix.IMAGE }}:${{ matrix.PHP_VERSION }}-${{ matrix.IMAGE_VERSION }} - name: Upload our code into the docker container run: docker cp "$(pwd)" magento-project-community-edition:/data/extensions/