Merge pull request #301 from SU-SWS/release-4.0.0

Release 4.0.0
SU-SWS · Nov 8, 2023 · 4cd48e1 · 4cd48e1
2 parents 5cc5392 + 9028973
commit 4cd48e1
Show file tree

Hide file tree

Showing 602 changed files with 48,382 additions and 75,649 deletions.
diff --git a/.github/workflows/deploy_branch.yml b/.github/workflows/deploy_branch.yml
@@ -27,11 +27,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 3.x-20230622-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.x-20230622-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            3.x-20230622-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            3.x-20230622-${{ hashFiles('composer.json') }}-
-            3.x-20230622-
+            4.x-20230622-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.x-20230622-${{ hashFiles('composer.json') }}-
+            4.x-20230622-
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:

diff --git a/.github/workflows/dev_branch_actions.yml b/.github/workflows/dev_branch_actions.yml
@@ -5,7 +5,7 @@ name: Dev branch actions
 
 on:
   push:
-    branches: [3.x]
+    branches: [4.x]
 
 jobs:
   # Run tests on current PR branch.

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -37,11 +37,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            3.x-20231101-${{ hashFiles('composer.json') }}-
-            3.x-20231101-
+            4.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.x-20231101-${{ hashFiles('composer.json') }}-
+            4.x-20231101-
       - run: git config --system --add safe.directory '*'
       - name: Run Unit Tests
         # env:
@@ -87,11 +87,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            3.x-20231101-${{ hashFiles('composer.json') }}-
-            3.x-20231101-
+            4.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.x-20231101-${{ hashFiles('composer.json') }}-
+            4.x-20231101-
       - run: git config --system --add safe.directory '*'
       - name: Run tests
         run: |
@@ -147,11 +147,11 @@ jobs:
             docroot/libraries
             docroot/modules/contrib
             docroot/modules/custom
-          key: 3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 4.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            3.x-20231101-${{ hashFiles('composer.json') }}-
-            3.x-20231101-
+            4.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            4.x-20231101-${{ hashFiles('composer.json') }}-
+            4.x-20231101-
       - run: git config --system --add safe.directory '*'
       - name: Install Site
         run: |

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -33,8 +33,7 @@ tasks:
       composer install --no-interaction &&
       blt blt:telemetry:disable --no-interaction &&
       blt settings &&
-      blt drupal:install -n &&
-      blt sbsc
+      blt drupal:install -n
     command: |
       cd $GITPOD_REPO_ROOT &&
       echo 'Restarting Apache' &&

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # ACE SDSSGryphon
 
+4.0.0
+--------------------------------------------------------------------------------
+_Release Date: 2023-11-08_
+
+- 6f23a79 SDSS-000: Point understand-energy dev and test domains (#300)
+- 1242c3d SDSS-994: D10 | Gitpod support for 4.x (#299)
+- 1e14218 Merge pull request #298 from SU-SWS/SDSS-994--d10-upgrade
+- 582474b SDSS-995: D10 updates (#297)
+- 454ddb6 SDSS-1073: D10 | Automated test updates (#296)
+- 788049e CKEditor CSS fix.
+- beffa65 SDSS-1069: UPSTREAM | Pull stanford_profile 11.0.8 (#295)
+- 777fc28 Merge pull request #293 from SU-SWS/backtodev-3.0.1
+- 630042e backtodev-3.0.1
+
+
 3.0.0
 --------------------------------------------------------------------------------
 _Release Date: 2023-11-01_

diff --git a/blt/blt.yml b/blt/blt.yml
@@ -5,7 +5,7 @@ project:
     name: sdss_profile
   local: {  }
 git:
-  default_branch: 2.x
+  default_branch: 4.x
   remotes:
     - '[email protected]:stanfordsos.git'
 deploy:
@@ -17,7 +17,6 @@ drush:
   aliases:
     ci: self
   default_alias: '${drush.aliases.local}'
-simplesamlphp: true
 cm:
   strategy: config-split
   allow-overrides: true

diff --git a/blt/src/Blt/Plugin/Commands/GryphonHooksCommands.php b/blt/src/Blt/Plugin/Commands/GryphonHooksCommands.php
@@ -49,26 +49,11 @@ public function postMultiSiteInit() {
 
     $this->say(sprintf('Remember to create the cron task. Run <info>gryphon:create-cron</info> to create the new cron job.'));
     $create_db = $this->ask('Would you like to create the database on Acquia now? (y/n)');
-    if (substr(strtolower($create_db), 0, 1) == 'y') {
+    if (str_starts_with(strtolower($create_db), 'y')) {
       $this->invokeCommand('gryphon:create-database');
     }
   }
 
-  /**
-   * Deletes any local related file from artifact after BLT copies them over.
-   *
-   * @hook post-command artifact:build:simplesamlphp-config
-   */
-  public function postArtifactSamlConfigCopy() {
-    $deploy_dir = $this->getConfigValue('deploy.dir');
-    $files = glob("$deploy_dir/vendor/simplesamlphp/simplesamlphp/config/*local.*");
-    $task = $this->taskFileSystemStack();
-    foreach ($files as $file) {
-      $task->remove($file);
-    }
-    $task->run();
-  }
-
   /**
    * Copy the default global settings for local settings.
    *
@@ -105,39 +90,6 @@ public function preDbScrub(CommandData $comand_data) {
     $this->switchSiteContext($site);
   }
 
-  /**
-   * Set nobots to emit headers for non-production sites.
-   *
-   * @hook post-command artifact:ac-hooks:post-db-copy
-   */
-  public function postDbCopy($result, CommandData $comand_data) {
-    if (!EnvironmentDetector::isProdEnv()) {
-      // Disable alias since we are targeting specific uri.
-      $this->config->set('drush.alias', '');
-
-      foreach ($this->getConfigValue('multisites') as $multisite) {
-        $this->switchSiteContext($multisite);
-        $this->taskDrush()
-          ->drush('state:set nobots 1')
-          ->drush('sqlq')
-          ->arg('truncate config_pages__su_site_url')
-          ->run();
-      }
-    }
-  }
-
-  /**
-   * Perform actions after a site has been synced locally.
-   *
-   * @hook post-command drupal:sync:default:site
-   */
-  public function postDrupalSync(){
-    $this->taskDrush()
-      ->drush('sqlq')
-      ->arg('truncate config_pages__su_site_url')
-      ->run();
-  }
-
   /**
    * Get the url for the drush alias.
    *

diff --git a/composer.json b/composer.json
@@ -53,12 +53,12 @@
             "type": "package",
             "package": {
                 "name": "stanford-earth/stanford_earth_r25",
-                "version": "8.1.7",
+                "version": "8.1.8",
                 "type": "drupal-custom-module-rooms-site",
                 "source": {
                     "type": "git",
                     "url": "https://github.com/stanford-earth/stanford_earth_r25",
-                    "reference": "8.1.7"
+                    "reference": "8.1.8"
                 }
             }
         }
@@ -67,55 +67,46 @@
         "php": ">=8.0",
         "ext-imagick": "*",
         "acquia/blt": "^13.7",
-        "acquia/blt-simplesamlphp": "^1.0",
         "acquia/drupal-environment-detector": "^1.0",
+        "acquia/memcache-settings": "^1.2",
         "citation-style-language/locales": "1.0.0",
         "citation-style-language/styles-distribution": "1.0.0",
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.6",
-        "drupal/acquia_connector": "^4.0",
+        "drupal/acquia_connector": "dev-4.x",
         "drupal/acquia_purge": "^1.1",
         "drupal/address": "^1.2",
         "drupal/admin_toolbar": "^3.1",
-        "drupal/allowed_formats": "^2.0",
-        "drupal/anchor_link": "^2.5",
+        "drupal/allowed_formats": "^3.0",
         "drupal/auto_entitylabel": "^3.0@beta",
         "drupal/block_content_permissions": "^1.8",
         "drupal/change_labels": "^1.0",
         "drupal/chosen": "^4.0",
-        "drupal/ckeditor_a11ychecker": "^1.0",
-        "drupal/ckeditor_balloonpanel": "^1.1",
-        "drupal/ckeditor_blockimagepaste": "^1.4",
         "drupal/colorbox": "^2.0",
         "drupal/components": "^3.0",
         "drupal/conditional_fields": "^4.0",
         "drupal/config_filter": "^2.0",
         "drupal/config_ignore": "^3.0",
-        "drupal/config_merge": "^1.0-rc",
         "drupal/config_pages": "^2.6",
         "drupal/config_pages_overrides": "^2.0",
         "drupal/config_readonly": "^1.0@beta",
         "drupal/config_split": "^2.0",
-        "drupal/config_update": "^1.7",
         "drupal/confirm_leave": "^1.0@beta",
         "drupal/content_lock": "^2.2",
-        "drupal/core": "~9.5.0",
-        "drupal/core-composer-scaffold": "^9.0",
-        "drupal/core-recommended": "^9.0",
+        "drupal/core": "^10",
+        "drupal/core-composer-scaffold": "^10",
+        "drupal/core-recommended": "^10",
         "drupal/cshs": "^4.0",
         "drupal/default_content": "^2.0@alpha",
         "drupal/diff": "^1.0@RC",
         "drupal/display_field_copy": "^2.0",
         "drupal/domain_301_redirect": "^2.0",
         "drupal/ds": "^3.3",
-        "drupal/eck": "^1.0@beta",
-        "drupal/editor_advanced_link": "^1.8",
-        "drupal/editoria11y": "~2.0.0",
+        "drupal/editoria11y": "^2.0",
         "drupal/element_class_formatter": "^2.0@beta",
         "drupal/encrypt": "^3.0",
         "drupal/environment_indicator": "^4.0",
         "drupal/extlink": "^1.3",
-        "drupal/fakeobjects": "^1.1",
         "drupal/fast_404_generator": "^1.0",
         "drupal/field_encrypt": "^3.0",
         "drupal/field_formatter_class": "^1.5",
@@ -148,10 +139,11 @@
         "drupal/linkit": "^6.0",
         "drupal/markup": "^2.0",
         "drupal/mathjax": "^4.0",
+        "drupal/memcache": "^2.5",
         "drupal/menu_admin_per_menu": "^1.0",
         "drupal/menu_block": "^1.10",
         "drupal/menu_link_weight": "^2.0@alpha",
-        "drupal/metatag": "^1.3",
+        "drupal/metatag": "^2.0",
         "drupal/mysql56": "^1.1",
         "drupal/name": "^1.0@RC",
         "drupal/next": "^1.2",
@@ -176,7 +168,7 @@
         "drupal/search_api": "^1.19",
         "drupal/seckit": "^2.0",
         "drupal/shs": "^2.0@RC",
-        "drupal/smart_date": "^3.5",
+        "drupal/smart_date": "^4.0",
         "drupal/smart_trim": "^2.0",
         "drupal/stage_file_proxy": "^2.0",
         "drupal/taxonomy_entity_index": "^1.8",
@@ -191,7 +183,7 @@
         "drupal/views_contextual_filters_or": "^1.3",
         "drupal/views_custom_cache_tag": "^1.2",
         "drupal/views_infinite_scroll": "^2.0",
-        "drupal/views_rss": "^2.0@RC",
+        "drupal/views_rss": "^2.0",
         "drupal/views_taxonomy_term_name_depth": "^7.0",
         "drupal/webp": "^1.0@beta",
         "drupal/xmlsitemap": "^1.0",
@@ -200,28 +192,26 @@
         "onlyextart/colorbox": "dev-master#e58476becbc89dc671093d1bcd9f99b2167fa8f7",
         "sainsburys/guzzle-oauth2-plugin": "^3.0",
         "seboettg/citeproc-php": "2.4.1",
-        "simplesamlphp/simplesamlphp": "^1.19",
         "stanford-earth/stanford_earth_r25": "^8.1",
         "su-sws/ckeditor5_plugins": "^1.0",
-        "su-sws/drupal-patches": "^8.1",
+        "su-sws/drupal-patches": "^10.0",
         "su-sws/earth_news_importer": "1.x-dev",
-        "su-sws/nobots": "^8.2",
         "su-sws/react_paragraphs": "^8.2",
         "su-sws/stanford_actions": "^8.2",
         "su-sws/stanford_fields": "^8.2",
-        "su-sws/stanford_media": "^9.0",
+        "su-sws/stanford_media": "^10.0",
         "su-sws/stanford_migrate": "^8.3",
         "su-sws/stanford_profile_helper": "^9.3",
-        "su-sws/stanford_samlauth": "^1.0",
-        "su-sws/stanford_ssp": "^8.3"
+        "su-sws/stanford_samlauth": "^1.0"
     },
     "require-dev": {
         "acquia/blt-drupal-test": "^1.0",
         "acquia/blt-multisite": "^1.0",
+        "drupal/color": "^1.0",
         "drupal/upgrade_status": "^4.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "su-sws/blt-sws": "dev-main",
-        "su-sws/drupal-dev": "^8.2"
+        "su-sws/drupal-dev": "^10"
     },
     "replace": {
         "drupal/coder": "*"
@@ -234,16 +224,7 @@
     "config": {
         "sort-packages": true,
         "discard-changes": true,
-        "allow-plugins": {
-            "composer/installers": true,
-            "simplesamlphp/composer-module-installer": true,
-            "davidbarratt/custom-installer": true,
-            "drupal/console-extend-plugin": true,
-            "acquia/blt": true,
-            "cweagans/composer-patches": true,
-            "drupal/core-composer-scaffold": true,
-            "drupal/core-project-message": true
-        }
+        "allow-plugins": true
     },
     "extra": {
         "drupal-scaffold": {
@@ -316,6 +297,9 @@
         },
         "enable-patching": true,
         "patches": {
+            "drupal/google_analytics": {
+                "https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
+            },
             "drupal/google_tag": {
                 "Comment out GA conflict in Google Tag": "patches/contrib/google_tag-ga_conflict.patch"
             },
@@ -354,7 +338,6 @@
             "vendor/bin/blt blt:telemetry:disable --no-interaction",
             "vendor/bin/blt blt:init:settings",
             "vendor/bin/blt sws:keys",
-            "vendor/bin/blt source:build:simplesamlphp-config",
             "vendor/bin/blt recipes:aliases:init:acquia"
         ],
         "sync-sustainability": [