Fixed gailing Gitlab CI.

acquia · Sep 20, 2024 · 546f2cb · 546f2cb
1 parent e2b4e87
commit 546f2cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
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"
     }
   }
 }