From 6101303ac9569e9bdfb9ffb7a433dff2a577b195 Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Mon, 5 Aug 2024 07:40:14 +0200 Subject: [PATCH 1/4] Update checkout GitHub Action --- .github/workflows/coding-standard.yml | 2 +- .github/workflows/integration.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml index f101bdf..fa358ed 100644 --- a/.github/workflows/coding-standard.yml +++ b/.github/workflows/coding-standard.yml @@ -6,5 +6,5 @@ jobs: name: M2 Coding Standard runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: extdn/github-actions-m2/magento-coding-standard@master diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index ff5ba4c..2c56a9d 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -23,21 +23,21 @@ 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 + - uses: actions/checkout@v4 - name: M2 Integration Tests with Magento 2 Version 2.4.3 (PHP 7.4) uses: extdn/github-actions-m2/magento-integration-tests/7.4@master with: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 ce_version: '2.4.3' - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 - ce_version: '2.4.4' - - uses: actions/checkout@v2 + ce_version: '2.4.4' + - uses: actions/checkout@v4 - name: M2 Integration Tests with Magento 2 Version 2.4.5 (PHP 8.1) uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: From 826e911f3f2c78f355c90f3f9e767c7dc76017ad Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Mon, 5 Aug 2024 07:43:17 +0200 Subject: [PATCH 2/4] Use latest Magento versions --- .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 2c56a9d..d674619 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -24,23 +24,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@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.3 (PHP 7.4) - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master + - name: M2 Integration Tests with Magento 2 Version 2.4.5-p8 (PHP 8.1) + uses: extdn/github-actions-m2/magento-integration-tests/8.1@master with: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 - ce_version: '2.4.3' + ce_version: '2.4.5-p8' - uses: actions/checkout@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.4 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master + - name: M2 Integration Tests with Magento 2 Version 2.4.6-p6 (PHP 8.2) + uses: extdn/github-actions-m2/magento-integration-tests/8.2@master with: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 - ce_version: '2.4.4' + ce_version: '2.4.6-p6' - uses: actions/checkout@v4 - - name: M2 Integration Tests with Magento 2 Version 2.4.5 (PHP 8.1) - uses: extdn/github-actions-m2/magento-integration-tests/8.1@master + - name: M2 Integration Tests with Magento 2 Version 2.4.7-p1 (PHP 8.3) + uses: extdn/github-actions-m2/magento-integration-tests/8.3@master with: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 - ce_version: '2.4.5' + ce_version: '2.4.7-p1' From c94053369bbd83ef1df9bdbe268e4b1e14ffc57d Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Mon, 5 Aug 2024 07:44:42 +0200 Subject: [PATCH 3/4] Update deprecated input --- .github/workflows/integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index d674619..678cdf5 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -29,18 +29,18 @@ jobs: with: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 - ce_version: '2.4.5-p8' + magento_version: '2.4.5-p8' - uses: actions/checkout@v4 - name: M2 Integration Tests with Magento 2 Version 2.4.6-p6 (PHP 8.2) uses: extdn/github-actions-m2/magento-integration-tests/8.2@master with: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 - ce_version: '2.4.6-p6' + magento_version: '2.4.6-p6' - uses: actions/checkout@v4 - name: M2 Integration Tests with Magento 2 Version 2.4.7-p1 (PHP 8.3) uses: extdn/github-actions-m2/magento-integration-tests/8.3@master with: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 - ce_version: '2.4.7-p1' + magento_version: '2.4.7-p1' From 5cc9158d4b9ce1b41b90f6072517061b9a0ec518 Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Mon, 5 Aug 2024 07:45:07 +0200 Subject: [PATCH 4/4] Use Composer v2 --- .github/workflows/integration.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 678cdf5..966aff9 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -30,6 +30,7 @@ jobs: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 magento_version: '2.4.5-p8' + composer_version: '2' - uses: actions/checkout@v4 - name: M2 Integration Tests with Magento 2 Version 2.4.6-p6 (PHP 8.2) uses: extdn/github-actions-m2/magento-integration-tests/8.2@master @@ -37,6 +38,7 @@ jobs: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 magento_version: '2.4.6-p6' + composer_version: '2' - uses: actions/checkout@v4 - name: M2 Integration Tests with Magento 2 Version 2.4.7-p1 (PHP 8.3) uses: extdn/github-actions-m2/magento-integration-tests/8.3@master @@ -44,3 +46,4 @@ jobs: module_name: FireGento_MageSetup composer_name: firegento/magesetup2 magento_version: '2.4.7-p1' + composer_version: '2'