From a983b5006b93bc846a42dfcff8587b1c262b7736 Mon Sep 17 00:00:00 2001 From: Vishal Khode Date: Mon, 18 Dec 2023 12:49:16 +0530 Subject: [PATCH 1/3] ACMS-000: Current is now Drupal 10.2.x. --- .github/workflows/acquia_cms_ci.workflow.yml | 27 +++++--------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml index 0a3169a5b..a663cfe66 100644 --- a/.github/workflows/acquia_cms_ci.workflow.yml +++ b/.github/workflows/acquia_cms_ci.workflow.yml @@ -135,7 +135,7 @@ jobs: fail-fast: false matrix: orca-job: - - ISOLATED_TEST_ON_NEXT_MINOR + - ISOLATED_TEST_ON_CURRENT #php-version: [ "8.1" ] acms_job: - integrated_php_unit_tests @@ -171,11 +171,6 @@ jobs: composer require "drupal/facets:^2.0.6" --no-update --no-install -d modules/acquia_cms_search composer require "drupal/pathauto:^1.11" --no-update --no-install -d modules/acquia_cms_common - if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then - # Update drupal/core patch as per Drupal Core version. - sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json - fi - # 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 @@ -244,7 +239,8 @@ jobs: fail-fast: false matrix: orca-job: - - ISOLATED_TEST_ON_NEXT_MINOR + - INTEGRATED_TEST_ON_PREVIOUS_MINOR + - ISOLATED_TEST_ON_CURRENT php-version: - 8.1 - 8.2 @@ -285,7 +281,7 @@ jobs: # Remove all PHPunit tests from acquia_cms modules. find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';' - if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then + if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_PREVIOUS_MINOR" ]; then # Update drupal/core patch as per Drupal Core version. sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json fi @@ -342,7 +338,7 @@ jobs: fail-fast: false matrix: orca-job: - - ISOLATED_TEST_ON_NEXT_MINOR + - ISOLATED_TEST_ON_CURRENT #php-version: [ "8.1" ] modules: - acquia_cms_article, acquia_cms_person, acquia_cms_place, acquia_cms_event @@ -388,11 +384,6 @@ jobs: 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 - if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then - # Update drupal/core patch as per Drupal Core version. - sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json - fi - modules_list=$(echo ${MODULES} | tr "," "\n") declare -a commands for module in ${modules_list} @@ -452,7 +443,7 @@ jobs: GIT_COMMITTER_NAME: "Github Actions" GIT_COMMITTER_EMAIL: "github-actions@exmaple.com" - ORCA_JOB: ISOLATED_TEST_ON_NEXT_MINOR + ORCA_JOB: ISOLATED_TEST_ON_CURRENT ACMS_JOB: "upgrade_modules" strategy: fail-fast: false @@ -481,12 +472,6 @@ jobs: # 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 - - if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then - # Update drupal/core patch as per Drupal Core version. - sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json - fi - ./tests/ci/before_install.blt.sh - name: Install shell: 'script -q -e -c "bash {0}"' From 2f2b2fe0eca70a2edc4fd0604093d1b29724ab13 Mon Sep 17 00:00:00 2001 From: Vishal Khode Date: Tue, 19 Dec 2023 22:22:57 +0530 Subject: [PATCH 2/3] ACMS-000: Pinned the acquia-cms-starterkit version as it's causing issues. --- composer.json | 2 +- composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 1428ca7f9..32837e6ba 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "acquia/acquia-cms-starterkit": "^1.0", + "acquia/acquia-cms-starterkit": "1.1.5", "drupal/acquia_claro": "^1.3", "drupal/acquia_cms_audio": "dev-develop", "drupal/acquia_cms_component": "dev-develop", diff --git a/composer.lock b/composer.lock index 55765e646..ee11511cd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f6054dd4abe7edc5b8a4d9c203a14693", + "content-hash": "6ea81b1e8f0eff48028db9f437e5322f", "packages": [ { "name": "acquia/acquia-cms-starterkit", @@ -20914,5 +20914,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } From 614130b72a907974ce4104fa14378c61686f6085 Mon Sep 17 00:00:00 2001 From: Vishal Khode Date: Tue, 19 Dec 2023 22:27:30 +0530 Subject: [PATCH 3/3] ACMS-000: Removed failing patch. --- composer.json | 3 --- composer.lock | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 32837e6ba..6aaf0f40b 100644 --- a/composer.json +++ b/composer.json @@ -137,9 +137,6 @@ "3111456 - Unable to resolve path on node in other language than default": "https://www.drupal.org/files/issues/2022-11-30/decouple_router-3111456-resolve-language-issue-58.patch", "3176615 - RouteNotFoundException when a jsonapi individual route is not available": "https://www.drupal.org/files/issues/2023-04-26/route-not-found-exception.patch" }, - "drupal/simple_sitemap": { - "3398996 - Declare min PHP version": "https://gist.githubusercontent.com/apathak18/fe33a24fa2009bb8c9e14761b54f3668/raw/9e4178a957ec16fd58ba3fc7a0b0d527f28d9f77/support-lower-phpversion-simplesitemap.patch" - }, "drupal/subrequests": { "3361224 - Fix Subrequests unit tests Deprecations": "https://git.drupalcode.org/project/subrequests/-/merge_requests/16.patch" }, diff --git a/composer.lock b/composer.lock index ee11511cd..ef7419d80 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6ea81b1e8f0eff48028db9f437e5322f", + "content-hash": "a9a378e6177db2526c5526efdcaf6eb2", "packages": [ { "name": "acquia/acquia-cms-starterkit",