ACMS-770: Update Facets and Cohesion, remove Cohesion patches. (#804)

* ACMS-767: Update Facets and Cohesion, remove Cohesion patches. * ACMS-729: Remove Starter jobs from main branch builds. (#767) * ACMS-770: Pin patched modules.
acquia · May 17, 2021 · 7b4f35b · 7b4f35b
1 parent 5330187
commit 7b4f35b
Show file tree

Hide file tree

Showing 3 changed files with 482 additions and 452 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -69,18 +69,18 @@ matrix:
     # current dev test.
     # Exclude push group tests on this job to exclude low and medium risk tests.
     - { name: "Isolated test on current dev Drupal core version", if: type = push, env: ACMS_JOB=base ACMS__JOB_EXCLUDE_PHPUNIT_TEST_GROUP="push" ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
-    - { name: "Starter", env: ACMS_JOB=starter ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
+    - { name: "Starter", if: NOT branch = main, env: ACMS_JOB=starter ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
     # Exclude pr group tests to exclude only low-risk tests during PR builds.
     - { name: "Isolated test on current dev Drupal core version - PR Tests", if: type = pull_request, env: ACMS_JOB=base ACMS__JOB_EXCLUDE_PHPUNIT_TEST_GROUP="pr" ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
     # The following jobs run only during cron runs, and fully install the site before
     # running tests.
     - { name: "Isolated test on current dev Drupal core version - Full Install", if: type = cron, env: ACMS_JOB=base_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
-    - { name: "Starter - Full Install", if: type = cron, env: ACMS_JOB=starter_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
+    - { name: "Starter - Full Install", if: NOT branch = main AND type = cron, env: ACMS_JOB=starter_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV}
     # Acquia CMS is going to support both PHP 7.3 and PHP 7.4 until Acquia Cloud
     # officially stop support for PHP 7.3.
     # Run the following jobs on PHP 7.3 to make sure it works fine, during cron run.
     - { php: "7.3", name: "[PHP 7.3] - Isolated test on current dev Drupal core version - Full Install", if: type = cron, env: ACMS_JOB=base_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV }
-    - { php: "7.3", name: "[PHP 7.3] - Starter - Full Install", if: type = cron, env: ACMS_JOB=starter_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV }
+    - { php: "7.3", name: "[PHP 7.3] - Starter - Full Install", if: NOT branch = main AND type = cron, env: ACMS_JOB=starter_full ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV }
     # Uncomment the following four lines to enable the corresponding tests once
     # the next major version of Drupal core has an alpha release or earlier.
     # Until then it's wasteful to use CI jobs on them, even if they exit early.

diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
         }
     ],
     "require": {
-        "acquia/cohesion": "^6.5",
-        "acquia/cohesion-theme": "^6.5",
+        "acquia/cohesion": "^6.5.1",
+        "acquia/cohesion-theme": "^6.5.1",
         "acquia/drupal-environment-detector": "^1",
         "acquia/memcache-settings": "^1",
         "cweagans/composer-patches": "^1.7",
@@ -27,19 +27,19 @@
         "drupal/acquia_lift": "^4.2",
         "drupal/acquia_purge": "^1",
         "drupal/acquia_search": "^3.0",
-        "drupal/acquia_telemetry-acquia_telemetry": "^1.0-alpha4",
+        "drupal/acquia_telemetry-acquia_telemetry": "1.0-alpha5",
         "drupal/acsf": "^2",
         "drupal/address": "^1",
         "drupal/admin_toolbar": "^2.0",
         "drupal/autologout": "^1",
         "drupal/checklistapi": "^2.0",
         "drupal/collapsiblock": "^3",
         "drupal/config_rewrite": "1.3",
-        "drupal/core": "^9.1.7",
+        "drupal/core": "~9.1.7",
         "drupal/default_content": "^2",
         "drupal/diff": "^1",
         "drupal/entity_clone": "1.0-beta4",
-        "drupal/facets": "^1.5",
+        "drupal/facets": "^1.8",
         "drupal/facets_pretty_paths": "^1.1",
         "drupal/field_group": "^3",
         "drupal/focal_point": "1.5",
@@ -52,7 +52,7 @@
         "drupal/imce": "2.x-dev",
         "drupal/jsonapi_extras": "^3",
         "drupal/memcache": "^2.2",
-        "drupal/moderation_dashboard": "^1.0@beta",
+        "drupal/moderation_dashboard": "1.0.0-beta2",
         "drupal/moderation_sidebar": "^1.4",
         "drupal/mysql56": "^1.0",
         "drupal/password_policy": "3.0-beta1",
@@ -152,10 +152,6 @@
             "drupal/core": "-p2"
         },
         "patches": {
-            "acquia/cohesion": {
-                "Prevent error call to a member function getOption() on null during starter enable": "https://gist.githubusercontent.com/chandan-singh7929/c70de6c88b8951022786cfeed75ff714/raw/dfe8481b77594405b27af24ec88da8254d9a00c1/frontendBuilderDropzone.patch",
-                "Prevent possible array_flip warning on config import/export": "https://gist.githubusercontent.com/brianreese/9f5f8000853d76a3e805e5a6a39a94ba/raw/33152583acbb7888d436f1f8ce5e69609c080dee/site-studio-array-flip-warning.patch"
-            },
             "drupal/acquia_telemetry-acquia_telemetry": {
                 "Add check for core index": "https://www.drupal.org/files/issues/2020-08-18/3165473-27.patch"
             },