diff --git a/.github/workflows/coding-standard-images.yml b/.github/workflows/coding-standard-images.yml index fc495bc..bcec346 100644 --- a/.github/workflows/coding-standard-images.yml +++ b/.github/workflows/coding-standard-images.yml @@ -20,8 +20,6 @@ jobs: strategy: matrix: php-version: - - "7.3" - - "7.4" - "8.1" - "8.2" - "8.3" diff --git a/.github/workflows/integration-test-images.yml b/.github/workflows/integration-test-images.yml index 1ef87c8..596875a 100644 --- a/.github/workflows/integration-test-images.yml +++ b/.github/workflows/integration-test-images.yml @@ -20,8 +20,6 @@ jobs: strategy: matrix: php-version: - - "7.3" - - "7.4" - "8.1" - "8.2" - "8.3" diff --git a/.github/workflows/mess-detector-images.yml b/.github/workflows/mess-detector-images.yml index 211d120..3368660 100644 --- a/.github/workflows/mess-detector-images.yml +++ b/.github/workflows/mess-detector-images.yml @@ -27,8 +27,6 @@ jobs: strategy: matrix: php-version: - - "7.3" - - "7.4" - "8.1" - "8.2" - "8.3" diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml index c7943c3..4a6352e 100644 --- a/.github/workflows/php-compatibility.yml +++ b/.github/workflows/php-compatibility.yml @@ -20,8 +20,6 @@ jobs: strategy: matrix: php-version: - - "7.3" - - "7.4" - "8.1" - "8.2" - "8.3" diff --git a/.github/workflows/phpstan-images.yml b/.github/workflows/phpstan-images.yml index 3cf301c..782140f 100644 --- a/.github/workflows/phpstan-images.yml +++ b/.github/workflows/phpstan-images.yml @@ -27,8 +27,6 @@ jobs: strategy: matrix: php-version: - - "7.3" - - "7.4" - "8.1" - "8.2" - "8.3" diff --git a/.github/workflows/unit-test-images.yml b/.github/workflows/unit-test-images.yml index f94afcd..a32ff0b 100644 --- a/.github/workflows/unit-test-images.yml +++ b/.github/workflows/unit-test-images.yml @@ -20,8 +20,6 @@ jobs: strategy: matrix: php-version: - - "7.3" - - "7.4" - "8.1" - "8.2" - "8.3" diff --git a/README.md b/README.md index 2689380..f32fea9 100644 --- a/README.md +++ b/README.md @@ -54,14 +54,14 @@ jobs: runs-on: ubuntu-latest services: mysql: - image: mysql:5.7 + image: mysql:8.0 env: MYSQL_ROOT_PASSWORD: root ports: - 3306:3306 options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 es: - image: docker.io/wardenenv/elasticsearch:7.8 + image: docker.io/wardenenv/elasticsearch:7.17 ports: - 9200:9200 env: @@ -71,21 +71,23 @@ jobs: options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - uses: actions/checkout@v6 - - name: M2 Integration Tests with Magento 2 (Php7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master + - name: M2 Integration Tests with Magento 2 (PHP 8.3) + uses: extdn/github-actions-m2/magento-integration-tests/8.3@master with: module_name: Foo_Bar composer_name: foo/magento2-foobar - magento_version: '2.4.0' + magento_version: '2.4.7' ``` The following images are provided for use |Php | Image | |---|---| -|7.4 | extdn/github-actions-m2/magento-integration-tests/7.4@master | -|7.3 | extdn/github-actions-m2/magento-integration-tests/7.3@master | -|7.2 | extdn/github-actions-m2/magento-integration-tests/7.2@master | +|8.5 | extdn/github-actions-m2/magento-integration-tests/8.5@master | +|8.4 | extdn/github-actions-m2/magento-integration-tests/8.4@master | +|8.3 | extdn/github-actions-m2/magento-integration-tests/8.3@master | +|8.2 | extdn/github-actions-m2/magento-integration-tests/8.2@master | +|8.1 | extdn/github-actions-m2/magento-integration-tests/8.1@master | The following inputs are required: | with | description | @@ -106,24 +108,24 @@ The default [phpunit.xml](https://github.com/extdn/github-actions-m2/blob/master If this phpunit file does not work for you can provide a relative path to your own PHPUnit file via phpunit_file ``` - - name: M2 Integration Tests with Magento 2 (Php7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master + - name: M2 Integration Tests with Magento 2 (PHP 8.3) + uses: extdn/github-actions-m2/magento-integration-tests/8.3@master with: module_name: Foo_Bar composer_name: foo/magento2-foobar - magento_version: '2.4.0' + magento_version: '2.4.7' phpunit_file: './path/to/phpunit.xml' ``` Sometimes it may be needed to run additional commands before tests can run. For example to add or remove additional dependencies. Use the input magento_pre_install_script to provide a relative path to this script. Example ``` - - name: M2 Integration Tests with Magento 2 (Php7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master + - name: M2 Integration Tests with Magento 2 (PHP 8.3) + uses: extdn/github-actions-m2/magento-integration-tests/8.3@master with: module_name: Foo_Bar composer_name: foo/magento2-foobar - magento_version: '2.4.0' + magento_version: '2.4.7' magento_pre_install_script: './.github/integration-test-setup.sh' ``` diff --git a/examples/extdn-integration-tests-with-elasticsearch.yml b/examples/extdn-integration-tests-with-elasticsearch.yml index e600b37..31b5bd3 100644 --- a/examples/extdn-integration-tests-with-elasticsearch.yml +++ b/examples/extdn-integration-tests-with-elasticsearch.yml @@ -24,12 +24,6 @@ jobs: COMPOSER_NAME: ${{ secrets.COMPOSER_NAME }} steps: - uses: actions/checkout@v6 - - uses: extdn/github-actions-m2/magento-integration-tests/7.3@master - env: - MAGENTO_VERSION: '2.3.7-p3' - - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - env: - MAGENTO_VERSION: '2.4.3-p2' - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master env: MAGENTO_VERSION: '2.4.4' diff --git a/examples/extdn-integration-tests-with-marketplace.yml b/examples/extdn-integration-tests-with-marketplace.yml index dd3f1d8..5effac5 100644 --- a/examples/extdn-integration-tests-with-marketplace.yml +++ b/examples/extdn-integration-tests-with-marketplace.yml @@ -28,12 +28,6 @@ jobs: ELASTICSEARCH: 1 steps: - uses: actions/checkout@v6 - - uses: extdn/github-actions-m2/magento-integration-tests/7.3@master - env: - MAGENTO_VERSION: '2.3.7-p3' - - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - env: - MAGENTO_VERSION: '2.4.3-p2' - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master env: MAGENTO_VERSION: '2.4.4' diff --git a/examples/extdn-integration-tests.yml b/examples/extdn-integration-tests.yml index aabb19b..957fca5 100644 --- a/examples/extdn-integration-tests.yml +++ b/examples/extdn-integration-tests.yml @@ -18,12 +18,6 @@ jobs: COMPOSER_NAME: ${{ secrets.COMPOSER_NAME }} steps: - uses: actions/checkout@v6 - - uses: extdn/github-actions-m2/magento-integration-tests/7.3@master - env: - MAGENTO_VERSION: '2.3.7-p3' - - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - env: - MAGENTO_VERSION: '2.4.3-p2' - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master env: MAGENTO_VERSION: '2.4.4' diff --git a/examples/extdn-unit-tests.yml b/examples/extdn-unit-tests.yml index 5ade55a..69ef7f1 100644 --- a/examples/extdn-unit-tests.yml +++ b/examples/extdn-unit-tests.yml @@ -10,12 +10,6 @@ jobs: COMPOSER_NAME: ${{ secrets.COMPOSER_NAME }} steps: - uses: actions/checkout@v6 - - uses: extdn/github-actions-m2/magento-unit-tests/7.3@master - env: - MAGENTO_VERSION: '2.3.7-p3' - - uses: extdn/github-actions-m2/magento-unit-tests/7.4@master - env: - MAGENTO_VERSION: '2.4.3-p2' - uses: extdn/github-actions-m2/magento-unit-tests/8.1@master env: MAGENTO_VERSION: '2.4.4' diff --git a/magento-coding-standard/7.3/action.yml b/magento-coding-standard/7.3/action.yml deleted file mode 100644 index 5462bc1..0000000 --- a/magento-coding-standard/7.3/action.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: 'Magento 2 Coding Style' -author: 'ExtDN' -description: 'performs php static code analysis with the Magento 2 Coding Standard' -inputs: - phpcs_standard: - description: 'Path to your own PHPCS file or a specific standard. Leave empty to use "Magento2".' - required: false - phpcs_report: - description: 'Report to output. Default: "checkstyle"' - required: false - phpcs_severity: - description: 'Which severity to check for. Default: "8"' - required: false -runs: - using: 'docker' - image: 'docker://extdn/magento-coding-standard-action:7.3-latest' -branding: - icon: 'code' - color: 'green' diff --git a/magento-coding-standard/7.4/action.yml b/magento-coding-standard/7.4/action.yml deleted file mode 100644 index dbc5981..0000000 --- a/magento-coding-standard/7.4/action.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: 'Magento 2 Coding Style' -author: 'ExtDN' -description: 'performs php static code analysis with the Magento 2 Coding Standard' -inputs: - phpcs_standard: - description: 'Path to your own PHPCS file or a specific standard. Default: "Magento2"' - required: false - phpcs_report: - description: 'Report to output. Default: "checkstyle"' - required: false - phpcs_severity: - description: 'Which severity to check for. Default: "8"' - required: false -runs: - using: 'docker' - image: 'docker://extdn/magento-coding-standard-action:7.4-latest' -branding: - icon: 'code' - color: 'green' diff --git a/magento-coding-standard/Dockerfile:7.3 b/magento-coding-standard/Dockerfile:7.3 deleted file mode 100644 index b65b40b..0000000 --- a/magento-coding-standard/Dockerfile:7.3 +++ /dev/null @@ -1,15 +0,0 @@ -FROM php:7.3-cli-alpine3.9 - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -ENV COMPOSER_ALLOW_SUPERUSER=1 -RUN /usr/local/bin/composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true -RUN /usr/local/bin/composer global require dealerdirect/phpcodesniffer-composer-installer:* - -RUN /usr/local/bin/composer global require magento/magento-coding-standard:* --with-all-dependencies - -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini - -ADD problem-matcher.json /problem-matcher.json -ADD entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/magento-coding-standard/Dockerfile:7.4 b/magento-coding-standard/Dockerfile:7.4 deleted file mode 100644 index 6b5c532..0000000 --- a/magento-coding-standard/Dockerfile:7.4 +++ /dev/null @@ -1,15 +0,0 @@ -FROM php:7.4-cli-alpine - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -ENV COMPOSER_ALLOW_SUPERUSER=1 -RUN /usr/local/bin/composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true -RUN /usr/local/bin/composer global require dealerdirect/phpcodesniffer-composer-installer:* - -RUN /usr/local/bin/composer global require magento/magento-coding-standard:* --with-all-dependencies - -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini - -ADD problem-matcher.json /problem-matcher.json -ADD entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/magento-integration-tests/7.0/action.yml b/magento-integration-tests/7.0/action.yml deleted file mode 100644 index 779abfa..0000000 --- a/magento-integration-tests/7.0/action.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: 'Magento 2 integration tests' -author: 'ExtDN' -description: 'runs integration tests for given Magento 2 open source version' -inputs: - module_name: - description: 'Your Magento module name. Example: Foo_Bar' - required: true - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - ce_version: - description: 'Deprecated. Please use "magento_version" instead.' - magento_version: - description: 'Magento 2 Open Source version number' - required: true - default: '2.3.5-p2' - project_name: - description: 'Magento 2 project name' - required: true - default: 'magento/project-community-edition' - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - required: false - phpunit_file: - description: 'Relative path to your own PHPUnit file. Leave empty to use the default.' - required: false - pre_project_script: - description: 'Relative path to an optional script before Composer create-project is run. Leave empty to use the default.' - required: false - post_project_script: - description: 'Relative path to an optional script after Composer create-project is run. Leave empty to use the default.' - required: false - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - required: false - magento_post_install_script: - description: 'Relative path to an optional script after Magento installation is run. Leave empty to use the default.' - required: false - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: 'true' -runs: - using: 'docker' - image: 'docker://extdn/magento-integration-tests-action:7.0-latest' - env: - COMPOSER_MEMORY_LIMIT: -1 - -branding: - icon: 'code' - color: 'green' diff --git a/magento-integration-tests/7.1/action.yml b/magento-integration-tests/7.1/action.yml deleted file mode 100644 index f00ced0..0000000 --- a/magento-integration-tests/7.1/action.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: 'Magento 2 integration tests' -author: 'ExtDN' -description: 'runs integration tests for given Magento 2 open source version' -inputs: - module_name: - description: 'Your Magento module name. Example: Foo_Bar' - required: true - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - ce_version: - description: 'Deprecated. Please use "magento_version" instead.' - magento_version: - description: 'Magento 2 Open Source version number' - required: true - default: '2.3.5-p2' - project_name: - description: 'Magento 2 project name' - required: true - default: 'magento/project-community-edition' - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - required: false - phpunit_file: - description: 'Relative path to your own PHPUnit file. Leave empty to use the default.' - required: false - pre_project_script: - description: 'Relative path to an optional script before Composer create-project is run. Leave empty to use the default.' - required: false - post_project_script: - description: 'Relative path to an optional script after Composer create-project is run. Leave empty to use the default.' - required: false - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - required: false - magento_post_install_script: - description: 'Relative path to an optional script after Magento installation is run. Leave empty to use the default.' - required: false - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: 'true' -runs: - using: 'docker' - image: 'docker://extdn/magento-integration-tests-action:7.1-latest' - env: - COMPOSER_MEMORY_LIMIT: -1 - -branding: - icon: 'code' - color: 'green' diff --git a/magento-integration-tests/7.2/action.yml b/magento-integration-tests/7.2/action.yml deleted file mode 100644 index ab8f72b..0000000 --- a/magento-integration-tests/7.2/action.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: 'Magento 2 integration tests' -author: 'ExtDN' -description: 'runs integration tests for given Magento 2 open source version' -inputs: - module_name: - description: 'Your Magento module name. Example: Foo_Bar' - required: true - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - ce_version: - description: 'Deprecated. Please use "magento_version" instead.' - magento_version: - description: 'Magento 2 Open Source version number' - required: true - default: '2.3.5-p2' - project_name: - description: 'Magento 2 project name' - required: true - default: 'magento/project-community-edition' - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - required: false - phpunit_file: - description: 'Relative path to your own PHPUnit file. Leave empty to use the default.' - required: false - pre_project_script: - description: 'Relative path to an optional script before Composer create-project is run. Leave empty to use the default.' - required: false - post_project_script: - description: 'Relative path to an optional script after Composer create-project is run. Leave empty to use the default.' - required: false - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - required: false - magento_post_install_script: - description: 'Relative path to an optional script after Magento installation is run. Leave empty to use the default.' - required: false - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: 'true' -runs: - using: 'docker' - image: 'docker://extdn/magento-integration-tests-action:7.2-latest' - env: - COMPOSER_MEMORY_LIMIT: -1 - -branding: - icon: 'code' - color: 'green' diff --git a/magento-integration-tests/7.3/action.yml b/magento-integration-tests/7.3/action.yml deleted file mode 100644 index 6b75d67..0000000 --- a/magento-integration-tests/7.3/action.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: 'Magento 2 integration tests' -author: 'ExtDN' -description: 'runs integration tests for given Magento 2 open source version' -inputs: - module_name: - description: 'Your Magento module name. Example: Foo_Bar' - required: true - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - ce_version: - description: 'Deprecated. Please use "magento_version" instead.' - magento_version: - description: 'Magento 2 Open Source version number' - required: true - default: '2.4.0' - project_name: - description: 'Magento 2 project name' - required: true - default: 'magento/project-community-edition' - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - required: false - phpunit_file: - description: 'Relative path to your own PHPUnit file. Leave empty to use the default.' - required: false - pre_project_script: - description: 'Relative path to an optional script before Composer create-project is run. Leave empty to use the default.' - required: false - post_project_script: - description: 'Relative path to an optional script after Composer create-project is run. Leave empty to use the default.' - required: false - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - required: false - magento_post_install_script: - description: 'Relative path to an optional script after Magento installation is run. Leave empty to use the default.' - required: false - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: 'true' -runs: - using: 'docker' - image: 'docker://extdn/magento-integration-tests-action:7.3-latest' - env: - COMPOSER_MEMORY_LIMIT: -1 - -branding: - icon: 'code' - color: 'green' diff --git a/magento-integration-tests/7.4/action.yml b/magento-integration-tests/7.4/action.yml deleted file mode 100644 index 2f32823..0000000 --- a/magento-integration-tests/7.4/action.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: 'Magento 2 integration tests' -author: 'ExtDN' -description: 'runs integration tests for given Magento 2 open source version' -inputs: - module_name: - description: 'Your Magento module name. Example: Foo_Bar' - required: true - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - ce_version: - description: 'Deprecated. Please use "magento_version" instead.' - magento_version: - description: 'Magento 2 Open Source version number' - required: true - default: '2.4.3' - project_name: - description: 'Magento 2 project name' - required: true - default: 'magento/project-community-edition' - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - required: false - phpunit_file: - description: 'Relative path to your own PHPUnit file. Leave empty to use the default.' - required: false - pre_project_script: - description: 'Relative path to an optional script before Composer create-project is run. Leave empty to use the default.' - required: false - post_project_script: - description: 'Relative path to an optional script after Composer create-project is run. Leave empty to use the default.' - required: false - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - required: false - magento_post_install_script: - description: 'Relative path to an optional script after Magento installation is run. Leave empty to use the default.' - required: false - composer_version: - description: 'DEPREACATED. Composer v2 is now always used.' - required: false - default: '1' - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: 'true' -runs: - using: 'docker' - image: 'docker://extdn/magento-integration-tests-action:7.4-latest' - env: - COMPOSER_MEMORY_LIMIT: -1 - -branding: - icon: 'code' - color: 'green' diff --git a/magento-integration-tests/Dockerfile:7.0 b/magento-integration-tests/Dockerfile:7.0 deleted file mode 100644 index ecb0906..0000000 --- a/magento-integration-tests/Dockerfile:7.0 +++ /dev/null @@ -1,47 +0,0 @@ -FROM php:7.0-cli - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN grep -v security.debian.org /etc/apt/sources.list | grep -v stretch-updates | sed -e 's/deb.debian.org/archive.debian.org/' > /t && mv /t /etc/apt/sources.list -RUN apt-get update && apt-get -y install --no-install-recommends \ - mariadb-client \ - apt-transport-https \ - git \ - zlib1g-dev \ - zip \ - unzip \ - libjpeg62-turbo-dev \ - libfreetype6-dev \ - libzip-dev \ - libpng-dev \ - libjpeg-dev \ - libmcrypt-dev \ - libicu-dev \ - libxml2-dev \ - libxslt-dev \ - netcat \ - procps \ - xmlstarlet \ - && apt-get -y autoremove \ - && apt-get clean autoclean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN docker-php-ext-install pdo pdo_mysql -RUN docker-php-ext-install xsl -RUN docker-php-ext-install soap -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ -RUN docker-php-ext-install -j$(nproc) gd -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install mcrypt -RUN docker-php-ext-install zip -RUN docker-php-ext-install intl -RUN docker-php-ext-install pcntl -RUN docker-php-ext-install sockets - -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh - -COPY docker-files /docker-files -RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini - -ENTRYPOINT ["bash", "/entrypoint.sh"] diff --git a/magento-integration-tests/Dockerfile:7.1 b/magento-integration-tests/Dockerfile:7.1 deleted file mode 100644 index 2357960..0000000 --- a/magento-integration-tests/Dockerfile:7.1 +++ /dev/null @@ -1,46 +0,0 @@ -FROM php:7.1-cli - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN apt-get update && apt-get -y install --no-install-recommends \ - mariadb-client \ - apt-transport-https \ - git \ - zlib1g-dev \ - zip \ - unzip \ - libjpeg62-turbo-dev \ - libfreetype6-dev \ - libzip-dev \ - libpng-dev \ - libjpeg-dev \ - libmcrypt-dev \ - libicu-dev \ - libxml2-dev \ - libxslt-dev \ - netcat \ - procps \ - xmlstarlet \ - && apt-get -y autoremove \ - && apt-get clean autoclean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN docker-php-ext-install pdo pdo_mysql -RUN docker-php-ext-install xsl -RUN docker-php-ext-install soap -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ -RUN docker-php-ext-install -j$(nproc) gd -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install mcrypt -RUN docker-php-ext-install zip -RUN docker-php-ext-install intl -RUN docker-php-ext-install pcntl -RUN docker-php-ext-install sockets - -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh - -COPY docker-files /docker-files -RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini - -ENTRYPOINT ["bash", "/entrypoint.sh"] diff --git a/magento-integration-tests/Dockerfile:7.2 b/magento-integration-tests/Dockerfile:7.2 deleted file mode 100644 index bd83460..0000000 --- a/magento-integration-tests/Dockerfile:7.2 +++ /dev/null @@ -1,46 +0,0 @@ -FROM php:7.2-cli - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN apt-get update && apt-get -y install --no-install-recommends \ - mariadb-client \ - apt-transport-https \ - git \ - zlib1g-dev \ - zip \ - unzip \ - libjpeg62-turbo-dev \ - libfreetype6-dev \ - libzip-dev \ - libpng-dev \ - libjpeg-dev \ - libsodium-dev \ - libicu-dev \ - libxml2-dev \ - libxslt-dev \ - netcat \ - procps \ - xmlstarlet \ - && apt-get -y autoremove \ - && apt-get clean autoclean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN docker-php-ext-install pdo pdo_mysql -RUN docker-php-ext-install xsl -RUN docker-php-ext-install soap -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ -RUN docker-php-ext-install -j$(nproc) gd -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install sodium -RUN docker-php-ext-install zip -RUN docker-php-ext-install intl -RUN docker-php-ext-install pcntl -RUN docker-php-ext-install sockets - -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh - -COPY docker-files /docker-files -RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini - -ENTRYPOINT ["bash", "/entrypoint.sh"] diff --git a/magento-integration-tests/Dockerfile:7.3 b/magento-integration-tests/Dockerfile:7.3 deleted file mode 100644 index 00c22ef..0000000 --- a/magento-integration-tests/Dockerfile:7.3 +++ /dev/null @@ -1,46 +0,0 @@ -FROM php:7.3-cli - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN apt-get update && apt-get -y install --no-install-recommends \ - mariadb-client \ - apt-transport-https \ - git \ - zlib1g-dev \ - zip \ - unzip \ - libjpeg62-turbo-dev \ - libfreetype6-dev \ - libzip-dev \ - libpng-dev \ - libjpeg-dev \ - libsodium-dev \ - libicu-dev \ - libxml2-dev \ - libxslt-dev \ - netcat \ - procps \ - xmlstarlet \ - && apt-get -y autoremove \ - && apt-get clean autoclean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN docker-php-ext-install pdo pdo_mysql -RUN docker-php-ext-install xsl -RUN docker-php-ext-install soap -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ -RUN docker-php-ext-install -j$(nproc) gd -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install sodium -RUN docker-php-ext-install zip -RUN docker-php-ext-install intl -RUN docker-php-ext-install pcntl -RUN docker-php-ext-install sockets - -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh - -COPY docker-files /docker-files -RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini - -ENTRYPOINT ["bash", "/entrypoint.sh"] diff --git a/magento-integration-tests/Dockerfile:7.4 b/magento-integration-tests/Dockerfile:7.4 deleted file mode 100644 index 805d5e0..0000000 --- a/magento-integration-tests/Dockerfile:7.4 +++ /dev/null @@ -1,46 +0,0 @@ -FROM php:7.4-cli - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN apt-get update && apt-get -y install --no-install-recommends \ - mariadb-client \ - apt-transport-https \ - git \ - zlib1g-dev \ - zip \ - unzip \ - libjpeg62-turbo-dev \ - libfreetype6-dev \ - libzip-dev \ - libpng-dev \ - libjpeg-dev \ - libsodium-dev \ - libicu-dev \ - libxml2-dev \ - libxslt-dev \ - netcat \ - procps \ - xmlstarlet \ - && apt-get -y autoremove \ - && apt-get clean autoclean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN docker-php-ext-install pdo pdo_mysql -RUN docker-php-ext-install xsl -RUN docker-php-ext-install soap -RUN docker-php-ext-configure gd --with-freetype --with-jpeg -RUN docker-php-ext-install -j$(nproc) gd -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install sodium -RUN docker-php-ext-install zip -RUN docker-php-ext-install intl -RUN docker-php-ext-install pcntl -RUN docker-php-ext-install sockets - -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh - -COPY docker-files /docker-files -RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini - -ENTRYPOINT ["bash", "/entrypoint.sh"] diff --git a/magento-integration-tests/README.md b/magento-integration-tests/README.md index 8f3302f..670c6b4 100644 --- a/magento-integration-tests/README.md +++ b/magento-integration-tests/README.md @@ -10,14 +10,14 @@ jobs: runs-on: ubuntu-latest services: mysql: - image: mysql:5.7 + image: mysql:8.0 env: MYSQL_ROOT_PASSWORD: root ports: - 3306:3306 options: --tmpfs /tmp:rw --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 es: - image: docker.io/wardenenv/elasticsearch:7.8 + image: docker.io/wardenenv/elasticsearch:7.17 ports: - 9200:9200 env: @@ -27,12 +27,12 @@ jobs: options: --health-cmd="curl localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - uses: actions/checkout@v6 - - name: M2 Integration Tests with Magento 2 (Php7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master + - name: M2 Integration Tests with Magento 2 (PHP 8.3) + uses: extdn/github-actions-m2/magento-integration-tests/8.3@master with: module_name: Foo_Bar composer_name: foo/magento2-foobar - magento_version: '2.4.0' + magento_version: '2.4.7' ``` Make sure to modify the following values: @@ -41,7 +41,7 @@ Make sure to modify the following values: You could also choose to switch PHP version, by changing the tag of the Docker image: - - uses: extdn/github-actions-m2/magento-integration-tests/7.3@master + - uses: extdn/github-actions-m2/magento-integration-tests/8.5@master Additionally, you can add an environment variable `MAGENTO_PRE_INSTALL_SCRIPT` to run a script, after composer is configured, but before the composer installation is run. Likewise, you can customize your PHPUnit procedure by supplying diff --git a/magento-mess-detector/7.3/action.yml b/magento-mess-detector/7.3/action.yml deleted file mode 100644 index ef242a1..0000000 --- a/magento-mess-detector/7.3/action.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: 'Magento 2 Mess Detector' -author: 'ExtDN' -description: 'performs php static code analysis with the Magento 2 Mess Detector ruleset' -runs: - using: 'docker' - image: 'docker://extdn/magento-mess-detector-action:7.3-latest' -branding: - icon: 'code' - color: 'green' diff --git a/magento-mess-detector/7.4/action.yml b/magento-mess-detector/7.4/action.yml deleted file mode 100644 index d1e41ca..0000000 --- a/magento-mess-detector/7.4/action.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: 'Magento 2 Mess Detector' -author: 'ExtDN' -description: 'performs php static code analysis with the Magento 2 Mess Detector ruleset' -runs: - using: 'docker' - image: 'docker://extdn/magento-mess-detector-action:7.4-latest' -branding: - icon: 'code' - color: 'green' diff --git a/magento-mess-detector/Dockerfile b/magento-mess-detector/Dockerfile deleted file mode 100644 index 78b142d..0000000 --- a/magento-mess-detector/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM extdn/magento-integration-tests-action:7.4-latest AS builder -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -RUN composer create-project --repository=https://repo-magento-mirror.fooman.co.nz/ --no-plugins --no-install --no-interaction magento/project-community-edition /var/www/magento2ce "2.4.1" -WORKDIR "/var/www/magento2ce" -# https://github.com/composer/composer/issues/12623#issuecomment-3551953185 -RUN composer config --unset repositories || true -RUN composer config --unset repo.0 -RUN composer config repo.foomanmirror composer https://repo-magento-mirror.fooman.co.nz/ -RUN composer install --prefer-dist - - -FROM extdn/magento-integration-tests-action:7.4-latest -COPY --from=builder /var/www/magento2ce/ /m2/ -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -ADD phpunit.phpmd.xml /m2/dev/tests/static/phpunit.phpmd.xml -ADD PhpmdRunner.php /m2/dev/tests/static/testsuite/Magento/Test/Php/PhpmdRunner.php -ADD LiveCodePhpmdRunner.php /m2/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/LiveCodePhpmdRunner.php - -ADD entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/magento-mess-detector/Dockerfile:7.3 b/magento-mess-detector/Dockerfile:7.3 deleted file mode 100644 index 2650b74..0000000 --- a/magento-mess-detector/Dockerfile:7.3 +++ /dev/null @@ -1,24 +0,0 @@ -FROM extdn/magento-integration-tests-action:7.3-latest AS builder - -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -RUN composer create-project --repository=https://repo-magento-mirror.fooman.co.nz/ --no-plugins --no-install --no-interaction magento/project-community-edition /var/www/magento2ce "2.4.3-p3" - -WORKDIR "/var/www/magento2ce" -# https://github.com/composer/composer/issues/12623#issuecomment-3551953185 -RUN composer config --unset repositories || true -RUN composer config --unset repo.0 -RUN composer config repo.foomanmirror composer https://repo-magento-mirror.fooman.co.nz/ -RUN composer config --no-plugins allow-plugins true -RUN composer require hoa/regex --no-update -RUN composer config --json audit.ignore '{"PKSA-z3gr-8qht-p93v": "Ignored for CI", "PKSA-rkkf-636k-qjb3": "Ignored for CI", "PKSA-wws7-mr54-jsny": "Ignored for CI", "PKSA-db8d-773v-rd1n": "Ignored for CI", "PKSA-xwpn-zs9j-6wy5": "Ignored for CI", "PKSA-sf9j-1gs7-xzvx": "Ignored for CI", "PKSA-7h5p-prw9-w5nr": "Ignored for CI", "PKSA-pwvr-3754-v57r": "Ignored for CI", "PKSA-t5r2-p5q9-mtpn": "Ignored for CI", "PKSA-6bp1-9hfj-2cgv": "Ignored for CI", "PKSA-m1ph-vmbx-2xd3": "Ignored for CI", "PKSA-6zmq-d6mk-r5wm": "Ignored for CI", "PKSA-93hy-9dc1-gbwt": "Ignored for CI", "PKSA-9p8h-97x3-qxpm": "Ignored for CI", "PKSA-4t1p-xpk2-nsss": "Ignored for CI", "PKSA-dxyf-6n16-t87m": "Ignored for CI", "PKSA-n3s6-289w-qtqb": "Ignored for CI", "PKSA-stsw-jsf7-f6vs": "Ignored for CI", "PKSA-b14r-zh1d-vdrc": "Ignored for CI", "PKSA-v5yj-8nmz-sk2q": "Ignored for CI", "PKSA-ft77-7h5f-p3r6": "Ignored for CI", "PKSA-yg4s-vh6g-jnyh": "Ignored for CI", "PKSA-wdyb-c3m7-9v88": "Ignored for CI"}' -RUN composer install --prefer-dist - -FROM extdn/magento-integration-tests-action:7.3-latest -COPY --from=builder /var/www/magento2ce/ /m2/ -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -COPY phpunit.phpmd.xml /m2/dev/tests/static/phpunit.phpmd.xml -COPY PhpmdRunner.php /m2/dev/tests/static/testsuite/Magento/Test/Php/PhpmdRunner.php -COPY LiveCodePhpmdRunner.php /m2/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/LiveCodePhpmdRunner.php - -COPY entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/magento-mess-detector/Dockerfile:7.4 b/magento-mess-detector/Dockerfile:7.4 deleted file mode 100644 index 444d45f..0000000 --- a/magento-mess-detector/Dockerfile:7.4 +++ /dev/null @@ -1,24 +0,0 @@ -FROM extdn/magento-integration-tests-action:7.4-latest AS builder - -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -RUN composer create-project --repository=https://repo-magento-mirror.fooman.co.nz/ --no-plugins --no-install --no-interaction magento/project-community-edition /var/www/magento2ce "2.4.5-p14" - -WORKDIR "/var/www/magento2ce" -# https://github.com/composer/composer/issues/12623#issuecomment-3551953185 -RUN composer config --unset repositories || true -RUN composer config --unset repo.0 -RUN composer config repo.foomanmirror composer https://repo-magento-mirror.fooman.co.nz/ -RUN composer config --no-plugins allow-plugins true -RUN composer require hoa/regex --no-update -RUN composer config --json audit.ignore '{"PKSA-z3gr-8qht-p93v": "Ignored for CI", "PKSA-rkkf-636k-qjb3": "Ignored for CI", "PKSA-wws7-mr54-jsny": "Ignored for CI", "PKSA-db8d-773v-rd1n": "Ignored for CI", "PKSA-xwpn-zs9j-6wy5": "Ignored for CI", "PKSA-sf9j-1gs7-xzvx": "Ignored for CI", "PKSA-7h5p-prw9-w5nr": "Ignored for CI", "PKSA-4t1p-xpk2-nsss": "Ignored for CI", "PKSA-dxyf-6n16-t87m": "Ignored for CI", "PKSA-n3s6-289w-qtqb": "Ignored for CI", "PKSA-stsw-jsf7-f6vs": "Ignored for CI", "PKSA-yg4s-vh6g-jnyh": "Ignored for CI", "PKSA-wdyb-c3m7-9v88": "Ignored for CI"}' -RUN composer install --prefer-dist - -FROM extdn/magento-integration-tests-action:7.4-latest -COPY --from=builder /var/www/magento2ce/ /m2/ -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -COPY phpunit.phpmd.xml /m2/dev/tests/static/phpunit.phpmd.xml -COPY PhpmdRunner.php /m2/dev/tests/static/testsuite/Magento/Test/Php/PhpmdRunner.php -COPY LiveCodePhpmdRunner.php /m2/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/LiveCodePhpmdRunner.php - -COPY entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/magento-performance-compare/dist/docker-compose.yml b/magento-performance-compare/dist/docker-compose.yml index 8a1f9d8..1fecb8b 100644 --- a/magento-performance-compare/dist/docker-compose.yml +++ b/magento-performance-compare/dist/docker-compose.yml @@ -1,14 +1,14 @@ version: "3.5" services: php-fpm: - image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2 + image: quay.io/warden/php-fpm:${PHP_VERSION:-8.5}-magento2 volumes: - ${GITHUB_WORKSPACE}:/var/www/html networks: default: php-blackfire: - image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2-blackfire + image: quay.io/warden/php-fpm:${PHP_VERSION:-8.5}-magento2-blackfire volumes: - ${GITHUB_WORKSPACE}:/var/www/html networks: diff --git a/magento-performance-setup/action.yml b/magento-performance-setup/action.yml index a32f61d..1d6a858 100644 --- a/magento-performance-setup/action.yml +++ b/magento-performance-setup/action.yml @@ -5,7 +5,7 @@ inputs: php-version: required: false description: 'PHP Version' - default: '7.3' + default: '8.5' runs: using: 'node12' - main: 'dist/index.js' \ No newline at end of file + main: 'dist/index.js' diff --git a/magento-performance-setup/dist/docker-compose.yml b/magento-performance-setup/dist/docker-compose.yml index 8a1f9d8..1fecb8b 100644 --- a/magento-performance-setup/dist/docker-compose.yml +++ b/magento-performance-setup/dist/docker-compose.yml @@ -1,14 +1,14 @@ version: "3.5" services: php-fpm: - image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2 + image: quay.io/warden/php-fpm:${PHP_VERSION:-8.5}-magento2 volumes: - ${GITHUB_WORKSPACE}:/var/www/html networks: default: php-blackfire: - image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2-blackfire + image: quay.io/warden/php-fpm:${PHP_VERSION:-8.5}-magento2-blackfire volumes: - ${GITHUB_WORKSPACE}:/var/www/html networks: diff --git a/magento-performance-setup/docker-compose.yml b/magento-performance-setup/docker-compose.yml index 8a1f9d8..1fecb8b 100644 --- a/magento-performance-setup/docker-compose.yml +++ b/magento-performance-setup/docker-compose.yml @@ -1,14 +1,14 @@ version: "3.5" services: php-fpm: - image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2 + image: quay.io/warden/php-fpm:${PHP_VERSION:-8.5}-magento2 volumes: - ${GITHUB_WORKSPACE}:/var/www/html networks: default: php-blackfire: - image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2-blackfire + image: quay.io/warden/php-fpm:${PHP_VERSION:-8.5}-magento2-blackfire volumes: - ${GITHUB_WORKSPACE}:/var/www/html networks: diff --git a/magento-phpstan/7.3/action.yml b/magento-phpstan/7.3/action.yml deleted file mode 100644 index 40cdb34..0000000 --- a/magento-phpstan/7.3/action.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: 'Magento 2 PhpStan' -author: 'ExtDN' -description: 'performs php static code analysis with the Magento 2 PhpStan ruleset' -inputs: - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - required: false - phpstan_level: - description: 'PHPStan level to check. 1 by default.' - default: "1" - required: false - composer_version: - description: 'DEPREACATED. Composer v2 is now always used.' - required: false - default: "1" - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - required: false - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: "true" -runs: - using: 'docker' - image: 'docker://extdn/magento-phpstan-action:7.3-latest' -branding: - icon: 'code' - color: 'green' diff --git a/magento-phpstan/7.4/action.yml b/magento-phpstan/7.4/action.yml deleted file mode 100644 index e8795e7..0000000 --- a/magento-phpstan/7.4/action.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: 'Magento 2 PhpStan' -author: 'ExtDN' -description: 'performs php static code analysis with the Magento 2 PhpStan ruleset' -inputs: - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - required: false - phpstan_level: - description: 'PHPStan level to check. 1 by default.' - default: "1" - required: false - composer_version: - description: 'DEPREACATED. Composer v2 is now always used.' - required: false - default: "2" - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - required: false - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: "true" -runs: - using: 'docker' - image: 'docker://extdn/magento-phpstan-action:7.4-latest' -branding: - icon: 'code' - color: 'green' diff --git a/magento-phpstan/Dockerfile b/magento-phpstan/Dockerfile deleted file mode 100644 index 6770f62..0000000 --- a/magento-phpstan/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM extdn/magento-integration-tests-action:7.4-latest AS builder - -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -RUN composer create-project --repository=https://repo-magento-mirror.fooman.co.nz/ --no-plugins --no-install --no-interaction magento/project-community-edition /var/www/magento2ce "2.4.3-p2" - -WORKDIR "/var/www/magento2ce" -RUN composer config --no-plugins allow-plugins true -# https://github.com/composer/composer/issues/12623#issuecomment-3551953185 -RUN composer config --unset repositories || true -RUN composer config --unset repo.0 -RUN composer config repo.foomanmirror composer https://repo-magento-mirror.fooman.co.nz/ -RUN composer require hoa/regex --no-update -RUN composer install --prefer-dist - -FROM extdn/magento-integration-tests-action:7.4-latest -COPY --from=builder /var/www/magento2ce/ /m2/ -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini - -ADD entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/magento-phpstan/Dockerfile:7.3 b/magento-phpstan/Dockerfile:7.3 deleted file mode 100644 index 6d8f95d..0000000 --- a/magento-phpstan/Dockerfile:7.3 +++ /dev/null @@ -1,21 +0,0 @@ -FROM extdn/magento-integration-tests-action:7.3-latest AS builder - -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -RUN composer create-project --repository=https://repo-magento-mirror.fooman.co.nz/ --no-plugins --no-install --no-interaction magento/project-community-edition /var/www/magento2ce "2.4.3-p3" - -WORKDIR "/var/www/magento2ce" -# https://github.com/composer/composer/issues/12623#issuecomment-3551953185 -RUN composer config --unset repositories || true -RUN composer config --unset repo.0 -RUN composer config repo.foomanmirror composer https://repo-magento-mirror.fooman.co.nz/ -RUN composer config --no-plugins allow-plugins true -RUN composer require hoa/regex --no-update -RUN composer config --json audit.ignore '{"PKSA-z3gr-8qht-p93v": "Ignored for CI", "PKSA-rkkf-636k-qjb3": "Ignored for CI", "PKSA-wws7-mr54-jsny": "Ignored for CI", "PKSA-db8d-773v-rd1n": "Ignored for CI", "PKSA-xwpn-zs9j-6wy5": "Ignored for CI", "PKSA-sf9j-1gs7-xzvx": "Ignored for CI", "PKSA-7h5p-prw9-w5nr": "Ignored for CI", "PKSA-pwvr-3754-v57r": "Ignored for CI", "PKSA-t5r2-p5q9-mtpn": "Ignored for CI", "PKSA-6bp1-9hfj-2cgv": "Ignored for CI", "PKSA-m1ph-vmbx-2xd3": "Ignored for CI", "PKSA-6zmq-d6mk-r5wm": "Ignored for CI", "PKSA-93hy-9dc1-gbwt": "Ignored for CI", "PKSA-9p8h-97x3-qxpm": "Ignored for CI", "PKSA-4t1p-xpk2-nsss": "Ignored for CI", "PKSA-dxyf-6n16-t87m": "Ignored for CI", "PKSA-n3s6-289w-qtqb": "Ignored for CI", "PKSA-stsw-jsf7-f6vs": "Ignored for CI", "PKSA-b14r-zh1d-vdrc": "Ignored for CI", "PKSA-v5yj-8nmz-sk2q": "Ignored for CI", "PKSA-ft77-7h5f-p3r6": "Ignored for CI", "PKSA-yg4s-vh6g-jnyh": "Ignored for CI", "PKSA-wdyb-c3m7-9v88": "Ignored for CI"}' -RUN composer install --prefer-dist - -FROM extdn/magento-integration-tests-action:7.3-latest -COPY --from=builder /var/www/magento2ce/ /m2/ -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini - -ADD entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/magento-phpstan/Dockerfile:7.4 b/magento-phpstan/Dockerfile:7.4 deleted file mode 100644 index d7c6b7c..0000000 --- a/magento-phpstan/Dockerfile:7.4 +++ /dev/null @@ -1,21 +0,0 @@ -FROM extdn/magento-integration-tests-action:7.4-latest AS builder - -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini -RUN composer create-project --repository=https://repo-magento-mirror.fooman.co.nz/ --no-plugins --no-install --no-interaction magento/project-community-edition /var/www/magento2ce "2.4.5-p14" - -WORKDIR "/var/www/magento2ce" -# https://github.com/composer/composer/issues/12623#issuecomment-3551953185 -RUN composer config --unset repositories || true -RUN composer config --unset repo.0 -RUN composer config repo.foomanmirror composer https://repo-magento-mirror.fooman.co.nz/ -RUN composer config --no-plugins allow-plugins true -RUN composer require hoa/regex --no-update -RUN composer config --json audit.ignore '{"PKSA-z3gr-8qht-p93v": "Ignored for CI", "PKSA-rkkf-636k-qjb3": "Ignored for CI", "PKSA-wws7-mr54-jsny": "Ignored for CI", "PKSA-db8d-773v-rd1n": "Ignored for CI", "PKSA-xwpn-zs9j-6wy5": "Ignored for CI", "PKSA-sf9j-1gs7-xzvx": "Ignored for CI", "PKSA-7h5p-prw9-w5nr": "Ignored for CI", "PKSA-4t1p-xpk2-nsss": "Ignored for CI", "PKSA-dxyf-6n16-t87m": "Ignored for CI", "PKSA-n3s6-289w-qtqb": "Ignored for CI", "PKSA-stsw-jsf7-f6vs": "Ignored for CI", "PKSA-yg4s-vh6g-jnyh": "Ignored for CI", "PKSA-wdyb-c3m7-9v88": "Ignored for CI"}' -RUN composer install --prefer-dist - -FROM extdn/magento-integration-tests-action:7.4-latest -COPY --from=builder /var/www/magento2ce/ /m2/ -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini - -ADD entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/magento-quick-integration-tests/Dockerfile b/magento-quick-integration-tests/Dockerfile index 9d8a7bf..5b7e275 100644 --- a/magento-quick-integration-tests/Dockerfile +++ b/magento-quick-integration-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3 +FROM php:8.5-cli COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer diff --git a/magento-unit-tests/7.3/action.yml b/magento-unit-tests/7.3/action.yml deleted file mode 100644 index e4b8df2..0000000 --- a/magento-unit-tests/7.3/action.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: 'Magento 2 unit tests' -author: 'ExtDN' -description: 'runs unit tests for given Magento 2 open source version' -inputs: - module_name: - description: 'Your Magento module name. Example: Foo_Bar' - required: true - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - php_version: - description: 'PHP version' - required: true - default: '7.3' - magento_version: - description: 'Magento 2 Open Source version number' - required: true - default: '2.4.0' - project_name: - description: 'Magento 2 project name' - required: true - default: 'magento/project-community-edition' - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - phpunit_file: - description: 'Relative path to your own PHPUnit file. Leave empty to use the default.' - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: 'true' -runs: - using: 'docker' - image: 'docker://extdn/magento-unit-tests-action:7.3-latest' -branding: - icon: 'code' - color: 'green' diff --git a/magento-unit-tests/7.4/action.yml b/magento-unit-tests/7.4/action.yml deleted file mode 100644 index 703136f..0000000 --- a/magento-unit-tests/7.4/action.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: 'Magento 2 unit tests' -author: 'ExtDN' -description: 'runs unit tests for given Magento 2 open source version' -inputs: - module_name: - description: 'Your Magento module name. Example: Foo_Bar' - required: true - composer_name: - description: 'Your composer name. Example: foo/magento2-bar' - required: true - php_version: - description: 'PHP version' - required: true - default: '7.4' - magento_version: - description: 'Magento 2 Open Source version number' - required: true - default: '2.4.3' - project_name: - description: 'Magento 2 project name' - required: true - default: 'magento/project-community-edition' - module_source: - description: 'Relative path to your module source within your repository. Empty by default.' - phpunit_file: - description: 'Relative path to your own PHPUnit file. Leave empty to use the default.' - magento_pre_install_script: - description: 'Relative path to an optional script before Magento installation is run. Leave empty to use the default.' - block_insecure: - description: 'Whether Composer should block insecure packages during audit. Set to false to allow insecure packages.' - required: false - default: 'true' -runs: - using: 'docker' - image: 'docker://extdn/magento-unit-tests-action:7.4-latest' -branding: - icon: 'code' - color: 'green' diff --git a/magento-unit-tests/Dockerfile:7.2 b/magento-unit-tests/Dockerfile:7.2 deleted file mode 100644 index 4f78690..0000000 --- a/magento-unit-tests/Dockerfile:7.2 +++ /dev/null @@ -1,42 +0,0 @@ -FROM php:7.2 - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN apt-get update && apt-get -y install \ - mariadb-client \ - apt-transport-https \ - git \ - zlib1g-dev \ - zip \ - libjpeg62-turbo-dev \ - libfreetype6-dev \ - libzip-dev \ - libpng-dev \ - libjpeg-dev \ - libsodium-dev \ - libicu-dev \ - libxml2-dev \ - libxslt-dev \ - xmlstarlet \ - netcat \ - && apt-get -y autoremove \ - && apt-get clean autoclean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN docker-php-ext-install pdo pdo_mysql -RUN docker-php-ext-install xsl -RUN docker-php-ext-install soap -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ -RUN docker-php-ext-install -j$(nproc) gd -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install sodium -RUN docker-php-ext-install zip -RUN docker-php-ext-install intl -RUN docker-php-ext-install sockets - -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh - -COPY docker-files /docker-files - -ENTRYPOINT ["bash", "/entrypoint.sh"] diff --git a/magento-unit-tests/Dockerfile:7.3 b/magento-unit-tests/Dockerfile:7.3 deleted file mode 100644 index 291227c..0000000 --- a/magento-unit-tests/Dockerfile:7.3 +++ /dev/null @@ -1,42 +0,0 @@ -FROM php:7.3 - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN apt-get update && apt-get -y install \ - mariadb-client \ - apt-transport-https \ - git \ - zlib1g-dev \ - zip \ - libjpeg62-turbo-dev \ - libfreetype6-dev \ - libzip-dev \ - libpng-dev \ - libjpeg-dev \ - libsodium-dev \ - libicu-dev \ - libxml2-dev \ - libxslt-dev \ - xmlstarlet \ - netcat \ - && apt-get -y autoremove \ - && apt-get clean autoclean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN docker-php-ext-install pdo pdo_mysql -RUN docker-php-ext-install xsl -RUN docker-php-ext-install soap -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ -RUN docker-php-ext-install -j$(nproc) gd -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install sodium -RUN docker-php-ext-install zip -RUN docker-php-ext-install intl -RUN docker-php-ext-install sockets - -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh - -COPY docker-files /docker-files - -ENTRYPOINT ["bash", "/entrypoint.sh"] diff --git a/magento-unit-tests/Dockerfile:7.4 b/magento-unit-tests/Dockerfile:7.4 deleted file mode 100644 index 041d2fc..0000000 --- a/magento-unit-tests/Dockerfile:7.4 +++ /dev/null @@ -1,43 +0,0 @@ -FROM php:7.4 - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN apt-get update && apt-get -y install \ - mariadb-client \ - apt-transport-https \ - git \ - zlib1g-dev \ - zip \ - libjpeg62-turbo-dev \ - libfreetype6-dev \ - libzip-dev \ - libpng-dev \ - libjpeg-dev \ - libsodium-dev \ - libicu-dev \ - libxml2-dev \ - libxslt-dev \ - xmlstarlet \ - netcat \ - && apt-get -y autoremove \ - && apt-get clean autoclean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN docker-php-ext-install pdo pdo_mysql -RUN docker-php-ext-install xsl -RUN docker-php-ext-install soap -RUN docker-php-ext-configure gd --with-freetype --with-jpeg -RUN docker-php-ext-install -j$(nproc) gd -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install sodium -RUN docker-php-ext-install zip -RUN docker-php-ext-install intl -RUN docker-php-ext-install sockets - -COPY entrypoint.sh /entrypoint.sh -RUN chmod 755 /entrypoint.sh - -COPY docker-files /docker-files - -ENTRYPOINT ["bash", "/entrypoint.sh"] - diff --git a/magento-unit-tests/README.md b/magento-unit-tests/README.md index 31504b3..fea13bb 100644 --- a/magento-unit-tests/README.md +++ b/magento-unit-tests/README.md @@ -9,9 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: extdn/github-actions-m2/magento-unit-tests/7.3@master + - uses: extdn/github-actions-m2/magento-unit-tests/8.3@master env: - MAGENTO_VERSION: '2.3.4' + MAGENTO_VERSION: '2.4.7' MODULE_NAME: Foo_Bar COMPOSER_NAME: foo/magento2-foobar ``` @@ -30,15 +30,15 @@ jobs: COMPOSER_NAME: foo/magento2-foobar steps: - uses: actions/checkout@v6 - - uses: extdn/github-actions-m2/magento-unit-tests/7.3@master + - uses: extdn/github-actions-m2/magento-unit-tests/8.3@master env: - MAGENTO_VERSION: '2.3.4' - - uses: extdn/github-actions-m2/magento-unit-tests/7.3@master + MAGENTO_VERSION: '2.4.7' + - uses: extdn/github-actions-m2/magento-unit-tests/8.3@master env: - MAGENTO_VERSION: '2.3.5-p2' - - uses: extdn/github-actions-m2/magento-unit-tests/7.4@master + MAGENTO_VERSION: '2.4.8' + - uses: extdn/github-actions-m2/magento-unit-tests/8.5@master env: - MAGENTO_VERSION: '2.4.0' + MAGENTO_VERSION: '2.4.9' ``` Make sure to modify the following values: @@ -47,4 +47,4 @@ Make sure to modify the following values: You could also choose to switch PHP version, by changing the tag of the Docker image: - - uses: extdn/github-actions-m2/magento-unit-tests/8.2@master + - uses: extdn/github-actions-m2/magento-unit-tests/8.5@master diff --git a/magento-unit-tests/build-and-push.sh b/magento-unit-tests/build-and-push.sh index 8baa6b3..a7b5e86 100755 --- a/magento-unit-tests/build-and-push.sh +++ b/magento-unit-tests/build-and-push.sh @@ -1,5 +1,5 @@ #!/bin/bash -for tag in 7.2 7.3 7.4 8.1 8.2 8.3 8.4 8.5; do +for tag in 8.1 8.2 8.3 8.4 8.5; do docker build -t yireo/github-actions-magento-unit-tests:$tag -f Dockerfile:$tag . docker push yireo/github-actions-magento-unit-tests:$tag done diff --git a/php-compatibility/7.3/action.yml b/php-compatibility/7.3/action.yml deleted file mode 100644 index b4719c9..0000000 --- a/php-compatibility/7.3/action.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: 'PHPCompatibility' -author: 'ExtDN' -description: 'performs php static code analysis with the PHPCompatibility Coding Standard' -inputs: - phpcs_standard: - description: 'PHPCompatibility standard.' - required: false -runs: - using: 'docker' - image: 'docker://extdn/php-compatibility-action:7.3-latest' -branding: - icon: 'code' - color: 'green' diff --git a/php-compatibility/7.4/action.yml b/php-compatibility/7.4/action.yml deleted file mode 100644 index 95c79d3..0000000 --- a/php-compatibility/7.4/action.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: 'PHPCompatibility' -author: 'ExtDN' -description: 'performs php static code analysis with the PHPCompatibility Coding Standard' -inputs: - phpcs_standard: - description: 'PHPCompatibility standard.' - required: false -runs: - using: 'docker' - image: 'docker://extdn/php-compatibility-action:7.4-latest' -branding: - icon: 'code' - color: 'green' diff --git a/php-compatibility/Dockerfile:7.3 b/php-compatibility/Dockerfile:7.3 deleted file mode 100644 index 0ffc523..0000000 --- a/php-compatibility/Dockerfile:7.3 +++ /dev/null @@ -1,11 +0,0 @@ -FROM php:7.3-cli-alpine3.9 - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN /usr/local/bin/composer global require phpcompatibility/php-compatibility:* -RUN ~/.composer/vendor/bin/phpcs --config-set installed_paths ../../phpcompatibility/php-compatibility -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini - -ADD problem-matcher.json /problem-matcher.json -ADD entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/php-compatibility/Dockerfile:7.4 b/php-compatibility/Dockerfile:7.4 deleted file mode 100644 index 6ac82e9..0000000 --- a/php-compatibility/Dockerfile:7.4 +++ /dev/null @@ -1,11 +0,0 @@ -FROM php:7.4-cli-alpine - -COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer - -RUN /usr/local/bin/composer global require phpcompatibility/php-compatibility:* -RUN ~/.composer/vendor/bin/phpcs --config-set installed_paths ../../phpcompatibility/php-compatibility -RUN echo memory_limit = -1 >> /usr/local/etc/php/conf.d/custom-memory.ini - -ADD problem-matcher.json /problem-matcher.json -ADD entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] diff --git a/php-compatibility/entrypoint.sh b/php-compatibility/entrypoint.sh index bfa89a4..3bb4b36 100755 --- a/php-compatibility/entrypoint.sh +++ b/php-compatibility/entrypoint.sh @@ -6,5 +6,5 @@ cp /problem-matcher.json ${HOME}/ echo "::add-matcher::${HOME}/problem-matcher.json" cd $GITHUB_WORKSPACE -test -z "${INPUT_RUNTIME}" && INPUT_RUNTIME=7.3-8.5 +test -z "${INPUT_RUNTIME}" && INPUT_RUNTIME=8.1-8.5 sh -c "/root/.composer/vendor/bin/phpcs --report=checkstyle --standard=PHPCompatibility --runtime-set testVersion $INPUT_RUNTIME $GITHUB_WORKSPACE -s $*"