Merge pull request #164 from SU-SWS/release-2.0.5

Release 2.0.5
SU-SWS · Jun 28, 2023 · d6b927e · d6b927e
2 parents 133ed38 + d797406
commit d6b927e
Show file tree

Hide file tree

Showing 63 changed files with 2,235 additions and 772 deletions.
diff --git a/.github/workflows/deploy_branch.yml b/.github/workflows/deploy_branch.yml
@@ -27,18 +27,19 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            2.x-${{ hashFiles('composer.json') }}-
-            2.x-
+            2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            2.x-20230621-${{ hashFiles('composer.json') }}-
+            2.x-20230621-
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:
           key: ${{ secrets.ACQUIA_SSH_KEY }}
           name: id_rsa
           known_hosts: ${{ secrets.KNOWN_HOSTS }}
           if_key_exists: fail
+      - run: git config --system --add safe.directory '*'
       - name: Deploy Artifact
         run: |
           git config --global user.email "[email protected]"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -37,11 +37,12 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            2.x-${{ hashFiles('composer.json') }}-
-            2.x-
+            2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            2.x-20230621-${{ hashFiles('composer.json') }}-
+            2.x-20230621-
+      - run: git config --system --add safe.directory '*'
       - name: Run Unit Tests
         # env:
         #   CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
@@ -86,11 +87,12 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            2.x-${{ hashFiles('composer.json') }}-
-            2.x-
+            2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            2.x-20230621-${{ hashFiles('composer.json') }}-
+            2.x-20230621-
+      - run: git config --system --add safe.directory '*'
       - name: Run tests
         run: |
           rm -rf /var/www/html
@@ -146,11 +148,12 @@ jobs:
             docroot/libraries
             docroot/modules/contrib
             docroot/modules/custom
-          key: 2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            2.x-${{ hashFiles('composer.json') }}-
-            2.x-
+            2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            2.x-20230621-${{ hashFiles('composer.json') }}-
+            2.x-20230621-
+      - run: git config --system --add safe.directory '*'
       - name: Install Site
         run: |
           rm -rf /var/www/html

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -0,0 +1,72 @@
+github:
+  prebuilds:
+    master: true
+    branches: false
+    pullRequests: true
+    pullRequestsFromForks: false
+    addCheck: false
+    addComment: false
+    addBadge: false
+ports:
+  - name: database
+    description: Mysql database
+    port: 3306
+    onOpen: ignore
+    visibility: private
+  - port: 33060
+    onOpen: ignore
+    visibility: private
+  - name: drupal
+    description: Drupal
+    port: 8001
+    onOpen: ignore
+    visibility: public
+  - port: 8002-9999
+    onOpen: ignore
+image: pookmish/drupal8ci:gitpod
+tasks:
+  - name: Drupal Prep
+    init: >
+      export PREVIEW_FULL_URL=`gp url 8001` &&
+      export PREVIEW_URL=${PREVIEW_FULL_URL#"https://"} &&
+      cp .gitpod/blt.yml blt/local.blt.yml &&
+      composer install --no-interaction &&
+      blt blt:telemetry:disable --no-interaction &&
+      blt settings &&
+      blt drupal:install -n &&
+      blt sbsc
+    command: |
+      cd $GITPOD_REPO_ROOT &&
+      echo 'Restarting Apache' &&
+      apache2ctl restart &&
+      gp ports await 8001 &&
+      find docroot -name 'local.drush.yml' | xargs rm &&
+      export PREVIEW_FULL_URL=`gp url 8001` &&
+      export PREVIEW_URL=${PREVIEW_FULL_URL#"https://"} &&
+      blt blt:telemetry:disable --no-interaction &&
+      echo 'Establishing Settings' &&
+      blt settings &&
+      echo 'Logging Into Drupal' &&
+      drush st &&
+      echo "drush uli --uri=$PREVIEW_FULL_URL" &&
+      drush uli --uri=$PREVIEW_FULL_URL &&
+      echo "drush uli --uri=$PREVIEW_FULL_URL | xargs gp preview --external" &&
+      drush uli --uri=$PREVIEW_FULL_URL | xargs gp preview --external &&
+      git config core.fileMode false
+  - name: SSH Keys
+    command: |
+      rm -rf ~/.ssh/id_rsa &&
+      rm -rf ~/.ssh/id_rsa.pub &&
+      eval $(command gp env -e) &&
+      mkdir -p ~/.ssh &&
+      [[ ! -z $SSH_PUBLIC_KEY  ]] &&
+      echo $SSH_PUBLIC_KEY | base64 -d > ~/.ssh/id_rsa.pub &&
+      chmod 644 ~/.ssh/id_rsa.pub &&
+      [[ ! -z $SSH_PRIVATE_KEY  ]] &&
+      echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa &&
+      chmod 600 ~/.ssh/id_rsa &&
+      cd $GITPOD_REPO_ROOT &&
+      git remote set-url origin [email protected]:SU-SWS/ace-sdssgryphon.git &&
+      [[ ! -z $GITCONFIG  ]] &&
+      echo $GITCONFIG | base64 -d > ~/.gitconfig &&
+      chmod 644 ~/.gitconfig
diff --git a/.gitpod/blt.yml b/.gitpod/blt.yml
@@ -0,0 +1,25 @@
+# Override any settings as necessary by copying to local.blt.yml
+#project:
+#  local:
+#    protocol: http
+#    hostname: mysite.dev
+
+# You can set custom project aliases in drush/sites/*.site.yml.
+# All local:* targets are run against drush.aliases.local.
+#drush:
+#  aliases:
+#    local: local.mysite.dev
+
+drupal:
+  account:
+    mail: [email protected]
+  db:
+    port: 3306
+    host: localhost
+    username: root
+    password: ''
+    database: 'drupal'
+project:
+  local:
+    protocol: https
+    hostname: '${env.PREVIEW_URL}'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # ACE SDSSGryphon
 
+2.0.5
+--------------------------------------------------------------------------------
+_Release Date: 2023-06-28_
+
+- SDSS-732: Updated earth_news_importer. (#162)
+  - SDSS-732: Updated earth_news_importer to latest version with new Banner Caption field.
+- SDSS-732: Added new Banner Caption field to News content type (#156)
+- SDSS-730: Maintenance and adding layout paragraphs (#152)
+  - Updated dependencies and configuration.
+  - Upgraded components module to ^3.0.
+  - Updated CI Cache string with current date.
+  - Added and enabled layout_paragraphs.
+  - Added path_alias service to SiteSettingsTest.
+- SDSS-639: Set up gitpod. (#154)
+- SDSS-585: Create generic related content field. (#135)
+  - SDSS-585: Create generic related content field and added to 5 main content types.
+- SDSS-000: Updated earth_news_importer to latest version. (#151)
+- SDSS-632: Allow site editors to use contextual links. (#149)
+- SDSS-599: Added aliases for understandenergy site (#147)
+- SDSS-532: Hid superhead field from editing interface on banner paragraph. (#148)
+- SDSS-638: Added additional fields to the Events XML feed. (#146)
+- SDSS-000: Added safe.directory git config step to github actions. (#145)
+- SDSS-634: Updated events this week RSS feed (#144)
+  - SDSS-634: Swapped description with alt_location field in events this week RSS feed view.
+- SDSS-625: Resolved menu scroll jump bug (#138)
+  - SDSS-625: Swapped scroll-padding-top on the html for scroll-margin-top on the :target to resolve menu scroll jump bug.
+
+
 2.0.4
 --------------------------------------------------------------------------------
 _Release Date: 2023-06-01_

diff --git a/README.md b/README.md
@@ -2,6 +2,26 @@
 
 This stack is based on the [SU-SWS/ace-gryphon](https://github.com/SU-SWS/ace-gryphon) stack.
 
+----
+# GitPod Setup
+1. Add your ssh key to [GitPod](https://gitpod.io/variables)
+   1. It is recommended to have a password-less ssh key for simplicity.
+      1. `ssh-keygen -b 4096`, press enter when asked for the password
+      2. Add this ssh public key to the necessary services: Acquia, Github, etc.
+   2. Get the base64 string of your ssh key files
+      1. `cat id_rsa | base64` for the private key
+      2. `cat id_rsa.pub | base64` for the public key.
+      - NOTE: Use `-w0` with base64 to remote any white space/line breaks.
+   1. Get the base64 string of your gitconfig
+      1. `cat ~/.gitconfig | base64`
+   3. In GitPod, add a variable named `SSH_PRIVATE_KEY` with the base64 encoded private key
+   4. In GitPod, add a variable named `SSH_PUBLIC_KEY` with the base64 encoded public key
+   5. In Gitpod, add a variable named `GITCONFIG` with your base64 encoded git config
+2. Recommended, but not required:
+   1. Install the GitPod browser plugin
+   2. Configure your browser settings for an easier experience: https://www.gitpod.io/docs/configure/browser-settings
+3. Open a gitpod workspace with [these instructions](https://www.gitpod.io/docs/getting-started#start-your-first-workspace)
+
 ----
 # Provisioning a new site
 There are several commands within BLT that make creating a new site much easier.
@@ -24,11 +44,11 @@ use the cloud API to upload and activate the cert on the acquia environment.
 # Config Management
 Each site has the ability to determine its own configuration management strategy.
 The default site in this repo will be using a configuration management that uses
-the configuration from the `stanford_profile`. By default this is the behavior
+the configuration from the `sdss_profile`. By default this is the behavior
 of all other sites unless defined within their own settings.php.
 
 There are three options a site can choose from:
-1. Do nothing and the configuration sync directory will use what is in `stanford_profile`.
+1. Do nothing and the configuration sync directory will use what is in `sdss_profile`.
 2. Modify the configuration sync directory to a desired directory such as another profile.
 3. Modify the configuration sync directory to point to an empty directory. This
 will bypass any configuration management strategy and the site's configuration will be updated via update hooks.

diff --git a/composer.json b/composer.json
@@ -139,7 +139,7 @@
         "drupal/ckeditor_balloonpanel": "^1.1",
         "drupal/ckeditor_blockimagepaste": "^1.4",
         "drupal/colorbox": "^2.0",
-        "drupal/components": "^2.4",
+        "drupal/components": "^3.0",
         "drupal/conditional_fields": "^4.0",
         "drupal/config_filter": "^2.0",
         "drupal/config_ignore": "^3.0",
@@ -191,6 +191,7 @@
         "drupal/layout_builder_modal": "^1.0",
         "drupal/layout_builder_restrictions": "^2.2",
         "drupal/layout_library": "^1.0-beta1",
+        "drupal/layout_paragraphs": "^2.0",
         "drupal/link_attributes": "^1.11",
         "drupal/link_title_formatter": "^2.0",
         "drupal/linkit": "^6.0",