Merge pull request #104 from SU-SWS/release-2.0.1

2.0.1

.github/workflows/deploy_branch.yml

@@ -0,0 +1,49 @@
+# .github/workflows/deploy_branch.yml
+# Deploys current branch to ACE application. Does not work with tags or commits,
+# such as a pull_request event.
+name: Deploy current branch
+
+# Allow this workflow to be called from other workflows.
+on: [workflow_call]
+
+jobs:
+  deploy:
+    name: Deploy Artifact
+    runs-on: ubuntu-latest
+    env:
+      DRUPAL_DATABASE_NAME: drupal
+      DRUPAL_DATABASE_USERNAME: drupal
+      DRUPAL_DATABASE_PASSWORD: drupal
+      DRUPAL_DATABASE_HOST: mysql
+    container:
+      image: pookmish/drupal8ci:latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Restore Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            vendor
+            docroot/core
+            docroot/libraries
+            docroot/modules/contrib
+          key: 2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          restore-keys: |
+            2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            2.x-${{ hashFiles('composer.json') }}-
+            2.x-
+      - 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
+      - name: Deploy Artifact
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Github Actions"
+          ssh-keyscan -t rsa svn-23450.prod.hosting.acquia.com >> /root/.ssh/known_hosts
+          composer install -n
+          blt blt:telemetry:disable --no-interaction
+          blt deploy -v -n

.github/workflows/dev_branch_actions.yml

@@ -0,0 +1,21 @@
+# .github/workflows/dev_branch_actions.yml
+# Actions triggered on merge to current dev branch (e.g., 1.x, 2.x, etc.,).
+# - Runs the tests workflow and deploys an artifact when tests pass.
+name: Dev branch actions
+
+on:
+  push:
+    branches: [2.x]
+
+jobs:
+  # Run tests on current PR branch.
+  tests:
+    uses: ./.github/workflows/tests.yml
+    # Allow secrets to be used in the called workflow.
+    secrets: inherit
+  # Deploy branch after tests pass by calling deploy workflow.
+  deploy:
+    uses: ./.github/workflows/deploy_branch.yml
+    # Allow secrets to be used in the called workflow.
+    secrets: inherit
+    needs: [tests]

.github/workflows/label.yml

@@ -1,3 +1,4 @@
+# .github/workflows/label.yml
 # This workflow will triage pull requests and apply a label based on the
 # paths that are modified in the pull request.
 #

.github/workflows/pull_request_actions.yml

@@ -0,0 +1,15 @@
+# .github/workflows/pull_request_actions.yml
+# Actions triggered on pull_request.
+# - Runs the tests workflow and deploys an artifact when tests pass.
+name: Pull request actions
+
+on:
+  pull_request:
+    types: [opened, reopened, ready_for_review, converted_to_draft, synchronize]
+
+jobs:
+  # Run tests on current PR branch.
+  tests:
+    uses: ./.github/workflows/tests.yml
+    # Allow secrets to be used in the called workflow.
+    secrets: inherit

.github/workflows/tests.yml

@@ -1,5 +1,10 @@
+# .github/workflows/tests.yml
+# Runs tests on current branch or tag.
 name: PHPUnit and Acceptance Tests
-on: [push]
+
+# Allow this workflow to be called from other workflows.
+on: [workflow_call]
+
 jobs:
   phpunit:
     name: PHPUnit Coverage Tests
@@ -167,48 +172,9 @@ jobs:
         with:
           name: functional-tests-results
           path: artifacts
-#  deploy:
-#    name: Deploy Artifact
-#    needs: [phpunit, acceptance, functional]
-#    runs-on: ubuntu-latest
-#    env:
-#      DRUPAL_DATABASE_NAME: drupal
-#      DRUPAL_DATABASE_USERNAME: drupal
-#      DRUPAL_DATABASE_PASSWORD: drupal
-#      DRUPAL_DATABASE_HOST: mysql
-#    container:
-#      image: pookmish/drupal8ci:latest
-#    steps:
-#      - uses: actions/checkout@v3
-#      - name: Restore Cache
-#        uses: actions/cache@v3
-#        with:
-#          path: |
-#            vendor
-#            docroot/core
-#            docroot/libraries
-#            docroot/modules/contrib
-#          key: 2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-#          restore-keys: |
-#            2.x-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-#            2.x-${{ hashFiles('composer.json') }}-
-#            2.x-
-#      - name: Deploy Artifact
-#        env:
-#          SSH_KEY: ${{secrets.SSH_KEY}}
-#        run: |
-#          mkdir -p ~/.ssh
-#          echo $SSH_KEY | base64 -d > ~/.ssh/id_rsa
-#          chmod 600 ~/.ssh/id_rsa
-#          eval `ssh-agent -s`
-#          ssh-add ~/.ssh/id_rsa
-#          ssh-keyscan svn-23450.prod.hosting.acquia.com > ~/.ssh/known_hosts
-#          git config --global user.email "[email protected]"
-#          git config --global user.name "Github Actions"
-#          composer install -n
-#          blt blt:telemetry:disable --no-interaction
-#          blt deploy -v -n
 
+# Cancel previous runs of this workflow in the same branch if they're still in
+# progress.
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true

CHANGELOG.md

@@ -1,5 +1,41 @@
 # ACE SDSSGryphon
 
+2.0.1
+--------------------------------------------------------------------------------
+_Release Date: 2023-03-28_
+
+- SDSS-225: Updated text colors on green row variant (#103)
+- SDSS-482: Added Event Topics and Shared Tags to Event List paragraph Arguments (#79)
+- SDSS-428: Adjusted permissions for roles to modify new taxonomy terms (#83)
+- SDSS-000: Updated BLT cron creation command. (#102)
+- SDSS-445: Updated button padding. (#82)
+- SDSS-456: Added scroll-padding-top style to account for sticky header (#84)
+- SDSS-228: Changed focus order for Event card display for improved accessibility (#92)
+- SDSS-84: Updated WYSIWYG style options (#93)
+- SDSS-498: Added view for RSS feed of events (#95)
+- SDSS-512: Updated font size units from px to rem (#94)
+- SDSS-525: Added featured media field to Event content type (#98)
+- SDSS-430: Removed unused logo asset from sdss_subtheme (#52)
+- SDSS-487: Pointed epsci.stanford.edu to gs site in sites.php. (#77)
+- SDSS-527: Updated sdss_subtheme npm packages including Decanter. (#99)
+- SDSS-528: Adjusted github actions workflows and resolved testViewRevisions failure. (#100)
+- SDSS-528: Adjusted dev branch actions workflow pull_request event activity types.
+- SDSS-528: Filled headline field in card for BasicPageParagraphsCest:testViewRevisions test now that field is required.
+- SDSS-423: Updated heading on list paragraphs from h3 to h2 (#85)
+- SDSS-499: Fixed min-height bug on mobile banner (#86)
+- SDSS-234: Updated decanter templates and non-discrimination footer link (#87)
+- SDSS-480: Required headline field on Card paragraph (#97)
+- SDSS-417: Added Focal Area field to Event content type (#80)
+- SDSS-251: Added three new taxonomies for opportunities (#78)
+- Updated dependencies. (#76)
+- SDSS-479: Set the default card type style to the Topic card (#74)
+- SDSS-488: Added page_cache_query_ignore patch to fix event display bug. (#75)
+- SDSS-488: Updated su-sws/drupal-patches to get page_cache_query_ignore patch which fixes metatag bug affecting event list display.
+- SDSS-369: Removed display of shortTitle from person pages (#68)
+- SDSS-474: Added auto deploy and improved test workflow (#58)
+- backtodev-2.0.1
+
+
 2.0.0
 --------------------------------------------------------------------------------
 _Release Date: 2023-03-08_

blt/src/Blt/Plugin/Commands/GryphonAcquiaApiCommands.php

@@ -38,7 +38,8 @@ public function createDrushCronJob($environment, $site) {
       throw new \Exception(sprintf('%s is not one of the multisites.', $site));
     }
     $this->connectAcquiaApi();
-    $command = sprintf('/usr/local/bin/drush9 --uri=%s --root=/var/www/html/${AH_SITE_NAME}/docroot -dv cron &>> /var/log/sites/${AH_SITE_NAME}/logs/$(hostname -s)/drush-cron-%s.log', $site, $site);
+    $site = str_replace('_', '-', str_replace('__', '.', $site));
+    $command = sprintf('/usr/local/bin/cron-wrapper.sh $AH_SITE_GROUP.$AH_SITE_ENVIRONMENT http://%s.stanford.edu', $site);
     $cron_job_api = new Crons($this->acquiaApi);
     $this->say($cron_job_api->create($this->getEnvironmentUuid($environment), $command, "0 */6 * * *", "Drush Cron $site")->message);
   }