From d60d476f6ac3f2c9b4df5e9a57650552b49491eb Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Fri, 20 Sep 2024 11:16:35 +0530 Subject: [PATCH 1/3] ACMS-4206: Fix site studio failing test. --- .../tests/src/Functional/SiteStudioPermissionsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/acquia_cms_site_studio/tests/src/Functional/SiteStudioPermissionsTest.php b/modules/acquia_cms_site_studio/tests/src/Functional/SiteStudioPermissionsTest.php index 2b8491496..9eb9f963e 100644 --- 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', From e2b4e870823a90f13f945fb437d629e99e4c1ccb Mon Sep 17 00:00:00 2001 From: rajeshreeputra Date: Fri, 20 Sep 2024 11:21:21 +0530 Subject: [PATCH 2/3] ACMS-4206: Enable site studio CI. --- .github/workflows/acquia_cms_ci.workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml index 602560db7..7cdfd7e5d 100644 --- a/.github/workflows/acquia_cms_ci.workflow.yml +++ b/.github/workflows/acquia_cms_ci.workflow.yml @@ -251,10 +251,10 @@ 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 + - sitestudio_config_management steps: - uses: actions/checkout@v3 - name: Use Node.js 12.13.1 From 546f2cbc127b285f7fd69cb3f3577df1680f857e Mon Sep 17 00:00:00 2001 From: Vishal Khode Date: Fri, 20 Sep 2024 16:05:47 +0530 Subject: [PATCH 3/3] Fixed gailing Gitlab CI. --- modules/acquia_cms_site_studio/.gitlab-ci.yml | 3 +++ modules/acquia_cms_site_studio/.gitlab-ci/patches/patches.json | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/acquia_cms_site_studio/.gitlab-ci.yml b/modules/acquia_cms_site_studio/.gitlab-ci.yml index 9be729fc7..8ad4723e9 100644 --- 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 index c2e6f9630..afbb132d4 100644 --- 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" } } }