diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml index fa358ed..37ecccb 100644 --- a/.github/workflows/coding-standard.yml +++ b/.github/workflows/coding-standard.yml @@ -2,9 +2,5 @@ name: ExtDN M2 Coding Standard on: [push, pull_request] jobs: - static: - name: M2 Coding Standard - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: extdn/github-actions-m2/magento-coding-standard@master + phpcs: + uses: customgento/m2-github-actions/.github/workflows/coding-standard.yml@main diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c102be9..1d45ecd 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -1,351 +1,9 @@ name: ExtDN M2 Integration Tests on: [ push, pull_request ] + jobs: - integration-tests-2-4-4-p6-8-1: - name: Magento 2.4.4-p6 PHP 8.1 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p6 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.4-p6' - composer_version: '2' - integration-tests-2-4-4-p6-7-4: - name: Magento 2.4.4-p6 PHP 7.4 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p6 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.4-p6' - composer_version: '2' - integration-tests-2-4-4-p5-7-4: - name: Magento 2.4.4-p5 PHP 7.4 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p5 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.4-p5' - composer_version: '2' - integration-tests-2-4-4-p5-8-1: - name: Magento 2.4.4-p5 PHP 8.1 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p5 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.4-p5' - composer_version: '2' - integration-tests-2-4-5-p5-8-1: - name: Magento 2.4.5-p5 PHP 8.1 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p5 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.5-p5' - composer_version: '2' - integration-tests-2-4-5-p5-7-4: - name: Magento 2.4.5-p5 PHP 7.4 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p5 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.5-p5' - composer_version: '2' - integration-tests-2-4-5-p4-7-4: - name: Magento 2.4.5-p4 PHP 7.4 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p4 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.5-p4' - composer_version: '2' - integration-tests-2-4-5-p4-8-1: - name: Magento 2.4.5-p4 PHP 8.1 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p4 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.5-p4' - composer_version: '2' - integration-tests-2-4-6-p3-8-1: - name: Magento 2.4.6-p3 PHP 8.1 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.6-p3 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.6-p3' - composer_version: '2' - integration-tests-2-4-6-p3-8-2: - name: Magento 2.4.6-p3 PHP 8.2 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.6-p3 (PHP 8.2) - uses: extdn/github-actions-m2/magento-integration-tests/8.2@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.6-p3' - composer_version: '2' - integration-tests-2-4-6-p2-8-2: - name: Magento 2.4.6-p2 PHP 8.2 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.6-p2 (PHP 8.2) - uses: extdn/github-actions-m2/magento-integration-tests/8.2@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.6-p2' - composer_version: '2' - integration-tests-2-4-6-p2-8-1: - name: Magento 2.4.6-p2 PHP 8.1 Integration Tests - runs-on: ubuntu-latest - services: - mysql: - image: mysql:5.7 - 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 - ports: - - 9200:9200 - env: - 'discovery.type': single-node - 'xpack.security.enabled': false - ES_JAVA_OPTS: "-Xms64m -Xmx512m" - 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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.6-p2 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_Koality - composer_name: customgento/module-koality-m2 - ce_version: '2.4.6-p2' - composer_version: '2' + integration: + uses: customgento/m2-github-actions/.github/workflows/integration.yml@main + with: + module_name: CustomGento_Koality + composer_name: customgento/module-koality-m2 diff --git a/.github/workflows/mess-detector.yml b/.github/workflows/mess-detector.yml index 23e9417..cf9e5b5 100644 --- a/.github/workflows/mess-detector.yml +++ b/.github/workflows/mess-detector.yml @@ -3,8 +3,4 @@ on: [push, pull_request] jobs: phpmd: - name: M2 Mess Detector - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: extdn/github-actions-m2/magento-mess-detector@master + uses: customgento/m2-github-actions/.github/workflows/mess-detector.yml@main diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 2dd8315..ed8dd26 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -3,10 +3,7 @@ on: [push, pull_request] jobs: phpstan: - name: M2 PHPStan - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: extdn/github-actions-m2/magento-phpstan@master - with: - composer_name: customgento/module-koality-m2 + uses: customgento/m2-github-actions/.github/workflows/phpstan.yml@main + with: + composer_name: customgento/module-koality-m2 + diff --git a/composer.json b/composer.json index dbfe9bf..7103c26 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "~7.3.0||~7.4.0||~8.1.0||~8.2.0", + "php": "~7.3.0||~7.4.0||~8.1.0||~8.2.0||~8.3.0", "magento/framework": "~102.0||~103.0", "magento/module-backend": "~101.0||~102.0", "magento/module-catalog": "~103.0||~104.0",