From 9954bcbe2c534a0dc2f4c43ca56de54ccff092d2 Mon Sep 17 00:00:00 2001 From: Waleed Date: Wed, 12 Apr 2023 09:14:36 +0200 Subject: [PATCH 01/15] Update GitHub actions --- .github/workflows/integration.yml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index dc0cc08..583d7d7 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -72,13 +72,38 @@ jobs: ce_version: '2.4.4-p1' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.5 (PHP 8.1) + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p1 (PHP 7.4) + uses: extdn/github-actions-m2/magento-integration-tests/7.4@master + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.5-p1' + composer_version: '2' + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p2 (PHP 7.4) + uses: extdn/github-actions-m2/magento-integration-tests/7.4@master + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.5-p2' + composer_version: '2' + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p1 (PHP 8.1) + uses: extdn/github-actions-m2/magento-integration-tests/8.1@master + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.5-p1' + composer_version: '2' + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p2 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.5' + ce_version: '2.4.5-p2' composer_version: '2' + - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.6 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master From 1db1d1c18c362282ce03c9cd63cd68b6799b86a1 Mon Sep 17 00:00:00 2001 From: Waleed Date: Thu, 13 Apr 2023 08:38:04 +0200 Subject: [PATCH 02/15] Remove Integration test for magento 2.4.5-* running PHP7.4 --- .github/workflows/integration.yml | 32 ++++++++----------------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 583d7d7..eaacb3c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -40,52 +40,36 @@ jobs: ce_version: '2.4.3-p3' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 7.4) + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p2 (PHP 7.4) uses: extdn/github-actions-m2/magento-integration-tests/7.4@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4' + ce_version: '2.4.4-p2' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 8.1) + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p2 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4' + ce_version: '2.4.4-p2' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 7.4) + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p3 (PHP 7.4) uses: extdn/github-actions-m2/magento-integration-tests/7.4@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4-p1' + ce_version: '2.4.4-p3' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 8.1) + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p3 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4-p1' - composer_version: '2' - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p1 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.5-p1' - composer_version: '2' - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p2 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.5-p2' + ce_version: '2.4.4-p3' composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.5-p1 (PHP 8.1) From b35ebfee18b0d5ae089545ffad5436fb38acf35a Mon Sep 17 00:00:00 2001 From: Waleed Date: Thu, 4 May 2023 11:57:24 +0200 Subject: [PATCH 03/15] Testing new extdn branch --- .github/workflows/phpstan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 12973b0..c79a803 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -7,6 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: extdn/github-actions-m2/magento-phpstan@master + - uses: waleedbasit/github-actions-m2/magento-phpstan@add-elasticsearch7-to-install-config with: composer_name: customgento/module-cli-tax-editor-m2 From 9c759938e688aeca784a883217ed8cdeaedfea31 Mon Sep 17 00:00:00 2001 From: Waleed Date: Thu, 4 May 2023 14:48:14 +0200 Subject: [PATCH 04/15] Test with only 2.4.6 --- .github/workflows/integration.yml | 66 ------------------------------- 1 file changed, 66 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index eaacb3c..8cedae4 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -22,72 +22,6 @@ jobs: 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@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.3-p2 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.3-p2' - composer_version: '2' - - uses: actions/checkout@v2 - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.3-p3 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.3-p3' - composer_version: '2' - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p2 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4-p2' - composer_version: '2' - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p2 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4-p2' - composer_version: '2' - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p3 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4-p3' - composer_version: '2' - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p3 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4-p3' - composer_version: '2' - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p1 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.5-p1' - composer_version: '2' - - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p2 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.5-p2' - composer_version: '2' - - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.6 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master From cd9907aa48bee17bed94d60c3f004f22d7aac11b Mon Sep 17 00:00:00 2001 From: Waleed Date: Fri, 5 May 2023 09:20:30 +0200 Subject: [PATCH 05/15] Testing new extdn branch --- .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 8cedae4..848cb08 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.6 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master + uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 From b80a8f1a7cacab03f8216e3d3ac77aa1190e5421 Mon Sep 17 00:00:00 2001 From: Waleed Date: Fri, 5 May 2023 10:26:15 +0200 Subject: [PATCH 06/15] Including all integration test --- .github/workflows/integration.yml | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 848cb08..19aa8d8 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -23,6 +23,63 @@ 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@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.3-p2 (PHP 7.4) + uses: waleedbasit/github-actions-m2/magento-integration-tests/7.4@refactoring-entrypoint.sh + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.3-p2' + composer_version: '2' + - uses: actions/checkout@v2 + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.3-p3 (PHP 7.4) + uses: waleedbasit/github-actions-m2/magento-integration-tests/7.4@refactoring-entrypoint.sh + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.3-p3' + composer_version: '2' + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 7.4) + uses: waleedbasit/github-actions-m2/magento-integration-tests/7.4@refactoring-entrypoint.sh + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.4' + composer_version: '2' + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 8.1) + uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.4' + composer_version: '2' + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 7.4) + uses: waleedbasit/github-actions-m2/magento-integration-tests/7.4@refactoring-entrypoint.sh + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.4-p1' + composer_version: '2' + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 8.1) + uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.4-p1' + composer_version: '2' + - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.5 (PHP 8.1) + uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.5' + composer_version: '2' + - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.6 (PHP 8.1) uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh with: From 4453846c131f0a9178618738e1a652d439895eea Mon Sep 17 00:00:00 2001 From: Waleed Date: Mon, 8 May 2023 14:19:04 +0200 Subject: [PATCH 07/15] Quick Integration test --- .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 19aa8d8..544de7e 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -1,7 +1,7 @@ name: ExtDN M2 Integration Tests on: [ push, pull_request ] jobs: - integration-tests: + quick-integration-tests: name: Magento 2 Integration Tests runs-on: ubuntu-latest services: From 3607e1234aa979c58246d459df2abb20e2e5ebd5 Mon Sep 17 00:00:00 2001 From: Waleed Date: Mon, 8 May 2023 14:29:36 +0200 Subject: [PATCH 08/15] Quick Integration test --- .github/workflows/phpstan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index c79a803..200240b 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -7,6 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: waleedbasit/github-actions-m2/magento-phpstan@add-elasticsearch7-to-install-config + - uses: waleedbasit/github-actions-m2/magento-phpstan@magento-quick-integration-tests-support-2.4.6 with: composer_name: customgento/module-cli-tax-editor-m2 From 99e736040547226b16d63c1ee564c582f3696b12 Mon Sep 17 00:00:00 2001 From: Waleed Date: Wed, 17 May 2023 14:27:03 +0200 Subject: [PATCH 09/15] Quick Integration test --- .github/workflows/integration.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 544de7e..3ffcb90 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -2,7 +2,7 @@ name: ExtDN M2 Integration Tests on: [ push, pull_request ] jobs: quick-integration-tests: - name: Magento 2 Integration Tests + name: Magento 2 Quick Integration Tests runs-on: ubuntu-latest services: mysql: @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.3-p2 (PHP 7.4) - uses: waleedbasit/github-actions-m2/magento-integration-tests/7.4@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/7.4@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.3-p3 (PHP 7.4) - uses: waleedbasit/github-actions-m2/magento-integration-tests/7.4@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/7.4@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -41,7 +41,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 7.4) - uses: waleedbasit/github-actions-m2/magento-integration-tests/7.4@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/7.4@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -49,7 +49,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 8.1) - uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -57,7 +57,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 7.4) - uses: waleedbasit/github-actions-m2/magento-integration-tests/7.4@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/7.4@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -65,7 +65,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 8.1) - uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -73,7 +73,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.5 (PHP 8.1) - uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -81,7 +81,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.6 (PHP 8.1) - uses: waleedbasit/github-actions-m2/magento-integration-tests/8.1@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 From 66fc4186d9e984854c16a29561adb88a7c4f822b Mon Sep 17 00:00:00 2001 From: Waleed Date: Wed, 17 May 2023 14:30:51 +0200 Subject: [PATCH 10/15] Quick Integration test --- .github/workflows/integration.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 3ffcb90..4e9ba0d 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.3-p2 (PHP 7.4) - uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/7.4@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/7.4@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.3-p3 (PHP 7.4) - uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/7.4@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/7.4@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -41,7 +41,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 7.4) - uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/7.4@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/7.4@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -49,7 +49,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 8.1) - uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/8.1@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -57,7 +57,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 7.4) - uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/7.4@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/7.4@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -65,7 +65,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 8.1) - uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/8.1@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -73,7 +73,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.5 (PHP 8.1) - uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/8.1@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 @@ -81,7 +81,7 @@ jobs: composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.6 (PHP 8.1) - uses: waleedbasit/github-actions-m2/quick-magento-integration-tests/8.1@refactoring-entrypoint.sh + uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/8.1@refactoring-entrypoint.sh with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 From b7704bd041497b4f8fdaed14bd3ed9a34a6644c3 Mon Sep 17 00:00:00 2001 From: norgeindian Date: Thu, 15 Jun 2023 14:42:22 +0200 Subject: [PATCH 11/15] Update github actions, SUP-8318 --- .github/workflows/integration.yml | 62 +++++++++++++++++++------------ .github/workflows/phpstan.yml | 2 +- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 4e9ba0d..405127c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -1,8 +1,8 @@ name: ExtDN M2 Integration Tests on: [ push, pull_request ] jobs: - quick-integration-tests: - name: Magento 2 Quick Integration Tests + integration-tests: + name: Magento 2 Integration Tests runs-on: ubuntu-latest services: mysql: @@ -23,67 +23,81 @@ 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@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.3-p2 (PHP 7.4) - uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/7.4@refactoring-entrypoint.sh + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p3 (PHP 7.4) + uses: extdn/github-actions-m2/magento-integration-tests/7.4@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.3-p2' + ce_version: '2.4.4-p3' composer_version: '2' - uses: actions/checkout@v2 + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p3 (PHP 8.1) + uses: extdn/github-actions-m2/magento-integration-tests/8.1@master + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.4-p3' + composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.3-p3 (PHP 7.4) - uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/7.4@refactoring-entrypoint.sh + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p4 (PHP 7.4) + uses: extdn/github-actions-m2/magento-integration-tests/7.4@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.3-p3' + ce_version: '2.4.4-p4' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 7.4) - uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/7.4@refactoring-entrypoint.sh + - name: M2 Integration Tests with Magento 2 Version 2.4.4-p4 (PHP 8.1) + uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4' + ce_version: '2.4.4-p4' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 8.1) - uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/8.1@refactoring-entrypoint.sh + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p2 (PHP 7.4) + uses: extdn/github-actions-m2/magento-integration-tests/7.4@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4' + ce_version: '2.4.5-p2' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 7.4) - uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/7.4@refactoring-entrypoint.sh + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p2 (PHP 8.1) + uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4-p1' + ce_version: '2.4.5-p2' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.4-p1 (PHP 8.1) - uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/8.1@refactoring-entrypoint.sh + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p3 (PHP 7.4) + uses: extdn/github-actions-m2/magento-integration-tests/7.4@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.4-p1' + ce_version: '2.4.5-p3' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.5 (PHP 8.1) - uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/8.1@refactoring-entrypoint.sh + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p3 (PHP 8.1) + uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.5' + ce_version: '2.4.5-p3' composer_version: '2' - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.6 (PHP 8.1) - uses: waleedbasit/github-actions-m2/magento-quick-integration-tests/8.1@refactoring-entrypoint.sh + uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: CustomGento_CliTaxEditor composer_name: customgento/module-cli-tax-editor-m2 ce_version: '2.4.6' composer_version: '2' + - name: M2 Integration Tests with Magento 2 Version 2.4.6-p1 (PHP 8.1) + uses: extdn/github-actions-m2/magento-integration-tests/8.1@master + with: + module_name: CustomGento_CliTaxEditor + composer_name: customgento/module-cli-tax-editor-m2 + ce_version: '2.4.6-p1' + composer_version: '2' diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 200240b..12973b0 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -7,6 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: waleedbasit/github-actions-m2/magento-phpstan@magento-quick-integration-tests-support-2.4.6 + - uses: extdn/github-actions-m2/magento-phpstan@master with: composer_name: customgento/module-cli-tax-editor-m2 From 9a81804dd03e23988031e1af02aaa39e3d5715bc Mon Sep 17 00:00:00 2001 From: norgeindian Date: Thu, 15 Jun 2023 14:45:10 +0200 Subject: [PATCH 12/15] Specify version, SUP-8318 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 107f84d..6c95bbb 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,7 @@ "description": "CLI Tax Editor for Magento 2 adds a CLI command to update tax rates.", "type": "magento2-module", "license": "OSL-3.0", + "version": "1.0.5", "authors": [ { "name": "Team CustomGento", From 81af535f7f75b2e8c2ebb1880a0afa68f6a8a51b Mon Sep 17 00:00:00 2001 From: norgeindian Date: Thu, 15 Jun 2023 14:57:35 +0200 Subject: [PATCH 13/15] Skip 2.4.5-p2 with PHP 7.4, SUP-8318 --- .github/workflows/integration.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 405127c..1609ab1 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -55,14 +55,6 @@ jobs: ce_version: '2.4.4-p4' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p2 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.5-p2' - composer_version: '2' - - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.5-p2 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: From 14a6b531ab44a4b45f00621c480958375d492995 Mon Sep 17 00:00:00 2001 From: norgeindian Date: Thu, 15 Jun 2023 15:09:58 +0200 Subject: [PATCH 14/15] Skip 2.4.5-p3 with PHP 7.4, SUP-8318 --- .github/workflows/integration.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 1609ab1..86c6de0 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -63,14 +63,6 @@ jobs: ce_version: '2.4.5-p2' composer_version: '2' - uses: actions/checkout@v2 - - name: M2 Integration Tests with Magento 2 Version 2.4.5-p3 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - with: - module_name: CustomGento_CliTaxEditor - composer_name: customgento/module-cli-tax-editor-m2 - ce_version: '2.4.5-p3' - composer_version: '2' - - uses: actions/checkout@v2 - name: M2 Integration Tests with Magento 2 Version 2.4.5-p3 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: From abec9d7582ab0f196efeeaca895eb6559dac85d2 Mon Sep 17 00:00:00 2001 From: norgeindian Date: Mon, 19 Jun 2023 08:58:49 +0200 Subject: [PATCH 15/15] Remove version, SUP-8318 --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 6c95bbb..107f84d 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,6 @@ "description": "CLI Tax Editor for Magento 2 adds a CLI command to update tax rates.", "type": "magento2-module", "license": "OSL-3.0", - "version": "1.0.5", "authors": [ { "name": "Team CustomGento",