Merge pull request #1884 from acquia/stage

Merge `stage` into `main`
acquia · Sep 20, 2024 · 571e916 · 571e916
2 parents f0a6bef + 4131e4d
commit 571e916
Show file tree

Hide file tree

Showing 35 changed files with 45 additions and 1,456 deletions.
diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml
@@ -251,10 +251,9 @@ jobs:
  - acquia_cms_person
  - acquia_cms_place
  - acquia_cms_search
- # - acquia_cms_site_studio
+ - acquia_cms_site_studio
  - acquia_cms_tour
  - acquia_cms_video
- # - sitestudio_config_management
  steps:
  - uses: actions/checkout@v3
  - name: Use Node.js 12.13.1

diff --git a/.github/workflows/acquia_cms_cron.yml b/.github/workflows/acquia_cms_cron.yml
@@ -385,7 +385,6 @@ jobs:
  - acquia_cms_site_studio
  - acquia_cms_tour
  - acquia_cms_video
- - sitestudio_config_management
  steps:
  - uses: actions/checkout@v4
  - name: Use Node.js 20.x

diff --git a/composer.json b/composer.json
@@ -27,13 +27,11 @@
  "drupal/acquia_cms_tour": "dev-develop",
  "drupal/consumer_image_styles": "^4.0",
  "drupal/gin": "^3.0@RC",
- "drupal/google_analytics": "dev-3430780-automated-drupal-11",
  "drupal/google_tag": "^2.0",
  "drupal/honeypot": "^2.1",
  "drupal/recaptcha": "^3.2",
  "drupal/reroute_email": "^2.2",
  "drupal/shield": "^1.7",
- "drupal/sitestudio_config_management": "dev-develop",
  "drupal/sitestudio_gin": "dev-3434617-automated-drupal-11",
  "drush/drush": "^10 || ^11 || ^12 || ^13",
  "mnsami/composer-custom-directory-installer": "^2.0"
@@ -224,23 +222,10 @@
  }
  }
  },
- "sitestudio_config_management": {
- "type": "path",
- "url": "./modules/sitestudio_config_management",
- "options": {
- "versions": {
- "drupal/sitestudio_config_management": "dev-develop"
- }
- }
- },
  "consumer_image_styles": {
  "type": "vcs",
  "url": "https://git.drupalcode.org/issue/consumer_image_styles-3429496.git"
  },
- "google_analytics": {
- "type": "vcs",
- "url": "https://git.drupalcode.org/issue/google_analytics-3430780.git"
- },
  "config_filter": {
  "type": "vcs",
  "url": "https://git.drupalcode.org/issue/config_filter-3428542.git"

diff --git a/composer.lock b/composer.lock
diff --git a/modules/acquia_cms_site_studio/.gitlab-ci.yml b/modules/acquia_cms_site_studio/.gitlab-ci.yml
@@ -15,6 +15,9 @@ variables:
  ORCA_SUT_BRANCH: 1.x
  ORCA_PACKAGES_CONFIG_ALTER: $CI_PROJECT_DIR/tests/packages_alter.yml
  COMPOSER_PATCHES_FILE: $CI_PROJECT_DIR/.gitlab-ci/patches/patches.json
+ # Site Studio 8.0.x doesn't support 9.5.x, hence skipping 9.5.x CI jobs now
+ SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR: 1
+ SKIP_INTEGRATED_TEST_ON_LATEST_EOL_MAJOR_PHP8: 1
 
 # Do not add patch for latest EOL Major i.e 9.5.x as it's working as expected.
 INTEGRATED_TEST_ON_LATEST_EOL_MAJOR:

diff --git a/modules/acquia_cms_site_studio/.gitlab-ci/patches/patches.json b/modules/acquia_cms_site_studio/.gitlab-ci/patches/patches.json
@@ -4,8 +4,7 @@
  "Fix failing test for site studio due to missing file": "https://gist.githubusercontent.com/chandan-singh7929/978c8c3c8b6f1e2de23492e7e562c0c3/raw/f0e7770d94be862e5495ca25662a0a0d5672b785/bypass-library-version-core.patch"
  },
  "acquia/cohesion": {
- "3457188: Module installation failure on Drupal core 10.3.0.": "https://www.drupal.org/files/issues/2024-06-26/cohesion-10.3.0.patch",
- "3457220: Clicking on Browse Button of Media Browser throws error on Drupal Core 10.3.0.": "https://www.drupal.org/files/issues/2024-06-26/cohesion-3457220.patch"
+ "Fixed schema error": "https://www.drupal.org/files/issues/2024-09-20/fix-schema.patch"
  }
  }
 }
diff --git a/modules/acquia_cms_site_studio/tests/src/Functional/SiteStudioPermissionsTest.php b/modules/acquia_cms_site_studio/tests/src/Functional/SiteStudioPermissionsTest.php
@@ -74,7 +74,7 @@ public static function providerRoleExistNotExist(): array {
  * @throws \Exception
  */
  public static function providerBasicPermissions(): array {
- $instance = new static();
+ $instance = new static('test');
  return [
  [
  'developer',

diff --git a/modules/acquia_cms_tour/composer.json b/modules/acquia_cms_tour/composer.json
@@ -9,7 +9,6 @@
  },
  "require-dev": {
  "drupal/acquia_cms_place": "^1",
- "drupal/google_analytics": "dev-3430780-automated-drupal-11",
  "drupal/recaptcha": "^3"
  },
  "config": {

diff --git a/modules/acquia_cms_tour/src/Controller/DashboardController.php b/modules/acquia_cms_tour/src/Controller/DashboardController.php
@@ -226,7 +226,7 @@ public function content() {
  $form['help_text'] = [
  '#type' => 'markup',
  '#markup' => $this->t("<i><h3>It seems like you have installed minimal Acquia CMS, which does not have any specific configurations. You are all set. Once you enable any of the modules supported by the wizard, they should start appearing here.
- (ex. google_analytics, gecoder, recaptcha, cohesion etc.).</h3></i>"),
+ (ex. gecoder, recaptcha, cohesion etc.).</h3></i>"),
  ];
  }
  $form['check_total']['#value'] = $total;