ACMS-3648: Fix failing tests with respect to drupal core requirement.

acquia · Apr 15, 2024 · 04233bb · 04233bb
1 parent 00cfd8e
commit 04233bb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml
@@ -55,12 +55,7 @@ jobs:
           curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply
           curl https://gist.githubusercontent.com/chandan-singh7929/902a17bbf0f5c0e0ee536dd5983875f3/raw/4031ae76ca5e8f08b98545bfdcda327f6d38be58/remove-local-settings.patch | git -C ../orca apply
       - name: Before Install
-        run: |
-          # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
-          sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
-
-          ../orca/bin/ci/before_install.sh
+        run: ../orca/bin/ci/before_install.sh
       - name: Install
         shell: 'script -q -e -c "bash {0}"'
         run: ./tests/ci/install.sh
@@ -167,10 +162,6 @@ jobs:
           # Update the CI by adding patches without pinning the following modules.
           #composer require "drupal/facets:^2.0.6" --no-update --no-install -d modules/acquia_cms_search
 
-          # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
-          sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
-
           # Remove all PHPUnit tests from individual modules, except the integrated & ExistingSite tests.
           if [ "${ACMS_JOB}" = "integrated_existing_site_tests" ]; then
             find modules/*/tests tests -type f -name "*Test.php" ! -path "*/ExistingSite*/*" -exec rm -fr '{}' ';'
@@ -269,8 +260,9 @@ jobs:
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
           sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
+          sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json
+          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
 
           # Remove all PHPunit tests from acquia_cms modules.
           find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';'
@@ -355,9 +347,7 @@ jobs:
           curl https://gist.githubusercontent.com/chandan-singh7929/902a17bbf0f5c0e0ee536dd5983875f3/raw/4031ae76ca5e8f08b98545bfdcda327f6d38be58/remove-local-settings.patch | git -C ../orca apply
       - name: Before Install
         run: |
-          # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
-          sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
+          composer require "drupal/core" --no-update --no-install -d modules/acquia_cms_common
           ./tests/ci/before_install.blt.sh
       - name: Install
         shell: 'script -q -e -c "bash {0}"'

diff --git a/.github/workflows/acquia_cms_cron.yml b/.github/workflows/acquia_cms_cron.yml
@@ -54,8 +54,9 @@ jobs:
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
           sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
+          sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json
+          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
           ../orca/bin/ci/before_install.sh
       - name: Install
         shell: 'script -q -e -c "bash {0}"'
@@ -109,8 +110,9 @@ jobs:
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
           sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
+          sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json
+          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
 
           # One of the patch is failing on Drupal Core 9.5. So remove that patch.
           if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then
@@ -205,8 +207,9 @@ jobs:
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
           sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
+          sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json
+          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
 
           if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then
             # NEW_JSON=$(composer config extra.patches."drupal/core" | sed -r 's/,?"3328187.*3142.patch"//')
@@ -291,8 +294,9 @@ jobs:
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
           sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
+          sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json
+          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
 
           ../orca/bin/ci/before_install.sh
       - name: Install
@@ -364,8 +368,9 @@ jobs:
       - name: Before Install
         run: |
           # Added below in CI to test acquia_cms on Drupal Core >=9.5.
-          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
           sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
+          sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json
+          composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
 
           # Remove all PHPunit tests from acquia_cms modules.
           find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';'