From 86dfdb97c3be29a7641dcd72d3884ae487c37d16 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Fri, 20 Sep 2024 20:58:50 +0530 Subject: [PATCH 1/3] Ignore Drupal check to Apigee Edge module for Drupal 10.3 --- .github/workflows/php.yml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 5348422f3..e23823e2f 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -38,6 +38,7 @@ 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" @@ -82,7 +83,31 @@ jobs: with: path: drupal/modules/contrib/apigee_edge - - name: "Allow plugins and dev dependencies" + - name: "Allow plugins and dev dependencies for Drupal ^10.3, " + if: ${{ matrix.drupal-core == '10.3.x' }} + run: | + cd drupal + composer config --no-plugins allow-plugins.composer/installers true + composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true + composer config --no-plugins allow-plugins.drupal/core-project-message true + composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true + composer config --no-plugins allow-plugins.wikimedia/composer-merge-plugin true + composer config --no-plugins allow-plugins.composer/package-versions-deprecated true + composer config --no-plugins allow-plugins.cweagans/composer-patches true + composer config --no-plugins allow-plugins.php-http/discovery true + composer config minimum-stability dev + composer require 'drupal/rules:^4.0' + composer require wikimedia/composer-merge-plugin + composer config --json extra.merge-plugin.require '["modules/contrib/apigee_edge/composer.json"]' + composer config platform.php ${{ matrix.php-version }} + composer config --json extra.patches."drupal/core" '{ "Support entities that are neither content nor config entities": "https://www.drupal.org/files/issues/2020-12-02/3042467-50.patch", "Add a method to access the original property": "https://www.drupal.org/files/issues/2023-07-22/2839195-105.patch"}' + composer update --with-all-dependencies + composer require --dev phpspec/prophecy-phpunit:^2 + composer require --dev drupal/classy:^1.0 + composer config --no-plugins allow-plugins.drupal/console-extend-plugin true + + - name: "Allow plugins and dev dependencies for Drupal 10.2" + if: ${{ matrix.drupal-core == '10.2.x' }} run: | cd drupal composer config --no-plugins allow-plugins.composer/installers true @@ -124,7 +149,8 @@ jobs: echo "APIGEE_EDGE_ENDPOINT=$APIGEE_EDGE_HYBRID_ENDPOINT" >> $GITHUB_ENV composer show > composer-show.txt - - name: "Drupal check" + - name: "Drupal check for Drupal 10.2" + if: ${{ matrix.drupal-core == '10.2.x' }} run: | cd drupal vendor/bin/drupal-check modules/contrib/apigee_edge From 42ec64684e7d41346545e6faff91a5acff5a8b7b Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Tue, 24 Sep 2024 20:59:39 +0530 Subject: [PATCH 2/3] Rules condition changes --- .github/workflows/php.yml | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index e23823e2f..c603a873b 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -83,8 +83,7 @@ jobs: with: path: drupal/modules/contrib/apigee_edge - - name: "Allow plugins and dev dependencies for Drupal ^10.3, " - if: ${{ matrix.drupal-core == '10.3.x' }} + - name: "Allow plugins and dev dependencies" run: | cd drupal composer config --no-plugins allow-plugins.composer/installers true @@ -96,7 +95,6 @@ jobs: composer config --no-plugins allow-plugins.cweagans/composer-patches true composer config --no-plugins allow-plugins.php-http/discovery true composer config minimum-stability dev - composer require 'drupal/rules:^4.0' composer require wikimedia/composer-merge-plugin composer config --json extra.merge-plugin.require '["modules/contrib/apigee_edge/composer.json"]' composer config platform.php ${{ matrix.php-version }} @@ -110,24 +108,15 @@ jobs: if: ${{ matrix.drupal-core == '10.2.x' }} run: | cd drupal - composer config --no-plugins allow-plugins.composer/installers true - composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true - composer config --no-plugins allow-plugins.drupal/core-project-message true - composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true - composer config --no-plugins allow-plugins.wikimedia/composer-merge-plugin true - composer config --no-plugins allow-plugins.composer/package-versions-deprecated true - composer config --no-plugins allow-plugins.cweagans/composer-patches true - composer config --no-plugins allow-plugins.php-http/discovery true - composer config minimum-stability dev composer require 'drupal/rules:3.x-dev@dev' - composer require wikimedia/composer-merge-plugin - composer config --json extra.merge-plugin.require '["modules/contrib/apigee_edge/composer.json"]' - composer config platform.php ${{ matrix.php-version }} - composer config --json extra.patches."drupal/core" '{ "Support entities that are neither content nor config entities": "https://www.drupal.org/files/issues/2020-12-02/3042467-50.patch", "Add a method to access the original property": "https://www.drupal.org/files/issues/2023-07-22/2839195-105.patch"}' composer update --with-all-dependencies - composer require --dev phpspec/prophecy-phpunit:^2 - composer require --dev drupal/classy:^1.0 - composer config --no-plugins allow-plugins.drupal/console-extend-plugin true + + - name: "Allow plugins and dev dependencies for Drupal 10.3" + if: ${{ matrix.drupal-core == '10.3.x' }} + run: | + cd drupal + composer require 'drupal/rules:^4.0' + composer update --with-all-dependencies # Install drupal using minimal installation profile and enable the module. - name: Install Drupal From 02b89cba0bf2aec1f5949ab3875b3fd53fea9ea2 Mon Sep 17 00:00:00 2001 From: Kedar Khaire Date: Tue, 24 Sep 2024 21:00:57 +0530 Subject: [PATCH 3/3] Removed extra space --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c603a873b..d31746147 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -83,7 +83,7 @@ jobs: with: path: drupal/modules/contrib/apigee_edge - - name: "Allow plugins and dev dependencies" + - name: "Allow plugins and dev dependencies" run: | cd drupal composer config --no-plugins allow-plugins.composer/installers true