Skip to content

Commit 0c36a8a

Browse files
authored
Merge pull request #1726 from acquia/ACMS-3473-1
ACMS-3473: update Page title should contextualize the local navigation patch as per drupal core latest release.
2 parents 93e2f9a + 4deca27 commit 0c36a8a

File tree

5 files changed

+25
-83
lines changed

5 files changed

+25
-83
lines changed

.github/workflows/acquia_cms_ci.workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ jobs:
283283
284284
if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_PREVIOUS_MINOR" ]; then
285285
# Update drupal/core patch as per Drupal Core version.
286-
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
286+
sed -i 's/2024-01-18\/3370946-page-title-backport-10-2-2_0.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json
287287
fi
288288
289289
../orca/bin/ci/before_install.sh

.github/workflows/acquia_cms_cron.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
composer config extra.patches.drupal/core {} --json
122122
sed -i 's/2598.patch",/2598.patch"/' modules/acquia_cms_common/composer.json
123123
sed -i '/3356894-mr_3896.patch/d' modules/acquia_cms_common/composer.json
124-
sed -i '/3370946-pagetitle-backport-10-2-x.patch/d' modules/acquia_cms_common/composer.json
124+
sed -i '/3370946-page-title-backport-10-2-2_0.patch/d' modules/acquia_cms_common/composer.json
125125
fi
126126
127127
# Remove all PHPUnit tests from individual modules, except the integrated & ExistingSite tests.

composer.lock

+20-78
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/acquia_cms_common/acquia_cms_common.info.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Acquia CMS Common"
22
package: "Acquia CMS"
33
description: "Handles shared functionality for Acquia CMS."
44
type: module
5-
core_version_requirement: ~10.2.0
5+
core_version_requirement: ~10.2.2
66
dependencies:
77
- acquia_purge:acquia_purge
88
- config_ignore:config_ignore

modules/acquia_cms_common/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"drupal/autologout": "^1.4",
1414
"drupal/config_ignore": "^3.0@beta",
1515
"drupal/config_rewrite": "^1.5",
16-
"drupal/core": "^10.2",
16+
"drupal/core": "^10.2.2",
1717
"drupal/diff": "^1.1",
1818
"drupal/entity_clone": "^2.0@beta",
1919
"drupal/field_group": "^3.4",
@@ -77,7 +77,7 @@
7777
"patches": {
7878
"drupal/core": {
7979
"3301692 - Passing null to parameter to mb_strtolower() is deprecated with PHP 8.1": "https://git.drupalcode.org/project/drupal/-/merge_requests/2598.patch",
80-
"3370946 - Page title should contextualize the local navigation": "https://www.drupal.org/files/issues/2023-11-30/3370946-pagetitle-backport-10-2-x.patch"
80+
"3370946 - Page title should contextualize the local navigation": "https://www.drupal.org/files/issues/2024-01-18/3370946-page-title-backport-10-2-2_0.patch"
8181
},
8282
"drupal/workbench_email": {
8383
"3408131 - Route 'entity.workbench_email_template.canonical' does not exist.": "https://git.drupalcode.org/project/workbench_email/-/merge_requests/17.patch"

0 commit comments

Comments
 (0)