From 4f634ee62e3f46210326622a1586f21019ef9bce Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Tue, 18 Jun 2024 17:14:48 +0530 Subject: [PATCH 1/7] M10n changes of PHP & Drupal version support updates --- .github/workflows/php.yml | 7 ++++--- composer.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 65391126..31f403d9 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -34,10 +34,11 @@ jobs: php-version: - "8.1" - "8.2" + - "8.3" drupal-core: # Should update the following as the minimum supported version from Drupal.org - - "10.1.x" - "10.2.x" + - "10.3.x" instance-type: - "Edge" - "X" @@ -143,7 +144,7 @@ jobs: vendor/bin/phpunit -c core --verbose --color --group apigee_m10n --testsuite unit,kernel,functional,functional-javascript modules/contrib/apigee_m10n - name: "Run PHPUnit tests with Code Coverage" - if: ${{ matrix.drupal-core == '10.1.x' && matrix.php-version == '8.1' }} + if: ${{ matrix.drupal-core == '10.2.x' && matrix.php-version == '8.2' }} run: | cd drupal cp modules/contrib/apigee_m10n/phpunit.core.xml.dist core/phpunit.xml @@ -157,7 +158,7 @@ jobs: path: drupal/sites/simpletest/browser_output/* - name: Upload coverage to Codecov - if: ${{ matrix.drupal-core == '10.1.x' && matrix.php-version == '8.1' }} + if: ${{ matrix.drupal-core == '10.2.x' && matrix.php-version == '8.2' }} uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/composer.json b/composer.json index 908461c2..cf2d537b 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "description": "Apigee Edge Monetization for Drupal", "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-bcmath": "*", "cweagans/composer-patches": "~1.6", "commerceguys/intl": "^2.0", From 7773aaa0fa7fb40ddbeb75b0f5c04678bb5e03f1 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Thu, 27 Jun 2024 15:53:23 +0530 Subject: [PATCH 2/7] Removed D10.3 coverage for now --- .github/workflows/php.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 31f403d9..5f964ccb 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -38,7 +38,6 @@ jobs: drupal-core: # Should update the following as the minimum supported version from Drupal.org - "10.2.x" - - "10.3.x" instance-type: - "Edge" - "X" From d310659b05073923bdd869ddf11c52e1b24d7cf7 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Wed, 21 Aug 2024 13:24:41 +0530 Subject: [PATCH 3/7] Change for test run --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cf2d537b..4f9b7a16 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "drupal/apigee_m10n", "license": "GPL-2.0", "type": "drupal-module", - "description": "Apigee Edge Monetization for Drupal", + "description": "Apigee Edge Monetization for Drupal", "require": { "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-bcmath": "*", From 03f7bcd6c1ab2b67347a06417c04ff4af3c9ce7e Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Wed, 21 Aug 2024 13:25:23 +0530 Subject: [PATCH 4/7] Revert for test run --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4f9b7a16..cf2d537b 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "drupal/apigee_m10n", "license": "GPL-2.0", "type": "drupal-module", - "description": "Apigee Edge Monetization for Drupal", + "description": "Apigee Edge Monetization for Drupal", "require": { "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-bcmath": "*", From 27b906aee263100b90696e181e10f61e95383d78 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Wed, 21 Aug 2024 19:19:21 +0530 Subject: [PATCH 5/7] Removed 8.3 support --- .github/workflows/php.yml | 1 - composer.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 5f964ccb..c55f99d3 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -34,7 +34,6 @@ jobs: php-version: - "8.1" - "8.2" - - "8.3" drupal-core: # Should update the following as the minimum supported version from Drupal.org - "10.2.x" diff --git a/composer.json b/composer.json index cf2d537b..908461c2 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "drupal-module", "description": "Apigee Edge Monetization for Drupal", "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0", "ext-bcmath": "*", "cweagans/composer-patches": "~1.6", "commerceguys/intl": "^2.0", From 4c423622db10708e638f6dc41987cd2315fdb039 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Tue, 17 Sep 2024 14:44:39 +0530 Subject: [PATCH 6/7] Drupal minimum version bump to 10.2 & php 8.3 support added --- .github/workflows/php.yml | 1 + composer.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c55f99d3..5f964ccb 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -34,6 +34,7 @@ jobs: php-version: - "8.1" - "8.2" + - "8.3" drupal-core: # Should update the following as the minimum supported version from Drupal.org - "10.2.x" diff --git a/composer.json b/composer.json index 908461c2..be021c42 100644 --- a/composer.json +++ b/composer.json @@ -4,12 +4,12 @@ "type": "drupal-module", "description": "Apigee Edge Monetization for Drupal", "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "ext-bcmath": "*", "cweagans/composer-patches": "~1.6", "commerceguys/intl": "^2.0", "drupal/apigee_edge": "^3.0.0", - "drupal/core": "^10.1", + "drupal/core": "^10.2", "drupal/requirement": "^1.2", "drupal/jquery_ui_dialog": "^2.0", "apigee/apigee-client-php": "^3.0.0" @@ -17,7 +17,7 @@ "require-dev": { "apigee/apigee-mock-client-php": "^1.1.1", "drupal/drupal-extension": "~5", - "drupal/core-dev": "^10.1", + "drupal/core-dev": "^10.2", "drush/drush": "^12.4.3", "mglaman/drupal-check": "^1.3", "phpmd/phpmd": "^2.8.2", From ae81e6aca4b8b2f05ba822d7340f321428dcd0a0 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Tue, 17 Sep 2024 16:37:01 +0530 Subject: [PATCH 7/7] Removed minimum Drupal version 10.3 requirement --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index be021c42..cf2d537b 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "cweagans/composer-patches": "~1.6", "commerceguys/intl": "^2.0", "drupal/apigee_edge": "^3.0.0", - "drupal/core": "^10.2", + "drupal/core": "^10.1", "drupal/requirement": "^1.2", "drupal/jquery_ui_dialog": "^2.0", "apigee/apigee-client-php": "^3.0.0" @@ -17,7 +17,7 @@ "require-dev": { "apigee/apigee-mock-client-php": "^1.1.1", "drupal/drupal-extension": "~5", - "drupal/core-dev": "^10.2", + "drupal/core-dev": "^10.1", "drush/drush": "^12.4.3", "mglaman/drupal-check": "^1.3", "phpmd/phpmd": "^2.8.2",