Skip to content

Commit

Permalink
Merge pull request #292 from SU-SWS/release-3.0.0
Browse files Browse the repository at this point in the history
Release 3.0.0
  • Loading branch information
joegl authored Nov 1, 2023
2 parents ec02ac9 + 20c6551 commit 5cc5392
Show file tree
Hide file tree
Showing 492 changed files with 31,651 additions and 10,038 deletions.
16 changes: 8 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
*.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
*.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 3.x-20230622-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
2.x-20230621-${{ hashFiles('composer.json') }}-
2.x-20230621-
3.x-20230622-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
3.x-20230622-${{ hashFiles('composer.json') }}-
3.x-20230622-
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev_branch_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Dev branch actions

on:
push:
branches: [2.x]
branches: [3.x]

jobs:
# Run tests on current PR branch.
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
2.x-20230621-${{ hashFiles('composer.json') }}-
2.x-20230621-
3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
3.x-20231101-${{ hashFiles('composer.json') }}-
3.x-20231101-
- run: git config --system --add safe.directory '*'
- name: Run Unit Tests
# env:
Expand Down Expand Up @@ -87,11 +87,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
2.x-20230621-${{ hashFiles('composer.json') }}-
2.x-20230621-
3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
3.x-20231101-${{ hashFiles('composer.json') }}-
3.x-20231101-
- run: git config --system --add safe.directory '*'
- name: Run tests
run: |
Expand All @@ -102,7 +102,6 @@ jobs:
composer install -n
blt blt:telemetry:disable --no-interaction
blt drupal:install -n
drush pm:uninstall simplesamlphp_auth -y
drush role:perm:add anonymous 'access content'
drush xmlsitemap:rebuild
blt codeception --suite=acceptance
Expand Down Expand Up @@ -148,11 +147,11 @@ jobs:
docroot/libraries
docroot/modules/contrib
docroot/modules/custom
key: 2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
2.x-20230621-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
2.x-20230621-${{ hashFiles('composer.json') }}-
2.x-20230621-
3.x-20231101-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
3.x-20231101-${{ hashFiles('composer.json') }}-
3.x-20231101-
- run: git config --system --add safe.directory '*'
- name: Install Site
run: |
Expand All @@ -163,7 +162,6 @@ jobs:
composer install -n
blt blt:telemetry:disable --no-interaction
blt drupal:install -n
drush pm:uninstall simplesamlphp_auth -y
drush role:perm:add anonymous 'access content'
drush xmlsitemap:rebuild
mkdir -p artifacts/_data/
Expand Down
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
# ACE SDSSGryphon

3.0.0
--------------------------------------------------------------------------------
_Release Date: 2023-11-01_

- fe1f6e0 SDSS-000: Added robots.txt patch (#291)
- 65af33d SDSS-1065: Github automation updates for 3.x (#290)
- 298d3e9 SDSS-1046: D9.5 | Fixed navigation wrapping and search icon styles (#282)
- 15646b5 SDSS-1046: D9.5 | Adjusted layout paragraph spacing (#283)
- e1e0980 SDSS-1053: Updated stanford_earth_r25 to 8.1.7 (#284)
- 14743d6 Merge pull request #280 from SU-SWS/SDSS-551--D9.5--upgrade
- b871d70 SDSS-1017: D9.5 | Layout background colors style adjustments (#281)
- a4f43f2 Fixes to update hooks.
- 3287f03 SDSS-559: Upgrade path for react to layout paragraphs. (#278)
- 4158e23 SDSS-1005: D9.5 | 3.x | Automated test updates (#275)
- e865781 SDSS-000: Increase rss_feeds view date range from 7 to 8 days (#276)
- 4e06d1a SDSS-1007: Support stanford_basic page.html.twig updates in sdss_subtheme (#270)
- 276378a SDSS-889: Added bg_color Layout Option for SDSS layout paragraphs (#263)
- fe69d5a SDSS-996: Switch to saml_auth from simplesamlphp (#261)
- b2b8346 Upstream | Updates from stanford_profile 10.1.2 (#259)
- f4a6650 Merge pull request #257 from SU-SWS/NOJIRA-20231004-merge-2.x
- 5612edd Updated subtheme version.
- d2f7c6f Merge branch '2.x' into NOJIRA-20231004-merge-2.x
- ae71e6b SDSS-849: A11Y | FE | Updated decanter and moved Skip to Main link into a landmark (#254)
- 8abaf45 SDSS-936: Updated line height for all image captions globally (#247)
- bf6cac5 SDSS-983: BUG | Fix role permissions for SDSS entities (#246)
- f9f3429 SDSS-968: Implement Media Contacts QA feedback (#241)
- 219db3a Merge pull request #245 from SU-SWS/backtodev-2.2.1
- aedf6ba backtodev-2.2.1
- bb968a1 Merge branch '2.x' into 3.x
- c5d83e5 SDSS-551: Drupal 9.5; Claro Admin theme; CKEditor 5; Layout paragraphs (#160)
- 5a0b8de Merge branch '2.x' into 3.x
- e6fd297 Merge branch 'feature/newsroom-layout-paragraphs' into 3.x


2.2.0
--------------------------------------------------------------------------------
_Release Date: 2023-09-27_
Expand Down
6 changes: 3 additions & 3 deletions blt/blt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ validate:
cloud:
appId: f7e9fc1b-062d-4ed8-baf7-ae33551f8934
keys_rsync:
ssh: stanfordsos.prod@ded-24959.prod.hosting.acquia.com
ssh: stanfordsos.[email protected].prod.acquia-sites.com
files:
- /mnt/gfs/stanfordsos.prod/nobackup/simplesamlphp/
- /mnt/gfs/stanfordsos.prod/secrets.settings.php
- /mnt/gfs/stanfordsos.test/nobackup/apikeys/
- /mnt/gfs/stanfordsos.test/secrets.settings.php
Loading

0 comments on commit 5cc5392

Please sign in to comment.