Skip to content

Commit

Permalink
Merge branch '11.5.2-release' into SHS-5907--easily-set-view
Browse files Browse the repository at this point in the history
  • Loading branch information
codechefmarc committed Nov 14, 2024
2 parents 7e88f57 + 2503de2 commit d2b2e50
Show file tree
Hide file tree
Showing 200 changed files with 1,811 additions and 2,074 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ add_known_hosts: &add_known_hosts
## Defines images and working directory.
defaults: &defaults
docker:
- image: pookmish/drupal8ci:latest
- image: pookmish/drupal8ci:php8.3
- image: circleci/mysql:5.7
environment:
MYSQL_DATABASE: drupal
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/acquia-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
acquia_cleanup:
runs-on: ubuntu-latest
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
steps:
- uses: actions/checkout@v4
- name: Restore Cache
Expand All @@ -20,11 +20,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.x-${{ hashFiles('blt/blt.yml') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-
- name: Clean up backups and branches
env:
SLACK_NOTIFICATION_URL: ${{ secrets.SLACK_NOTIFICATION_URL }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/content-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
Copy-Prod-Database-Down:
runs-on: ubuntu-latest
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
steps:
- uses: actions/checkout@v4
- name: Restore Cache
Expand All @@ -17,11 +17,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.x-${{ hashFiles('blt/blt.yml') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-
- name: Copy databases
env:
SLACK_NOTIFICATION_URL: ${{ secrets.SLACK_NOTIFICATION_URL }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
permissions: write-all
if: github.event.pull_request.merged
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
steps:
- name: Get Next Release
id: tag
Expand Down Expand Up @@ -53,11 +53,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.x-${{ hashFiles('blt/blt.yml') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-
- name: Deploy Tag
if: ${{ steps.tag.outputs.tag }}
run: |
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/sites-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
test_phpunit:
runs-on: ubuntu-latest
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
options: '--network-alias drupal8ci'
env:
REAL_AES_ENCRYPTION: ${{secrets.REAL_AES_ENCRYPTION}}
Expand Down Expand Up @@ -38,11 +38,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.x-
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.0-
- run: git config --system --add safe.directory '*'
- name: Install Dependencies
run: |
Expand All @@ -60,7 +60,7 @@ jobs:
set_sites:
runs-on: ubuntu-latest
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -73,11 +73,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.x-${{ hashFiles('blt/blt.yml') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-
- id: set-matrix
run: |
composer install -n &&
Expand All @@ -87,7 +87,7 @@ jobs:
lint_theme:
runs-on: ubuntu-latest
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
steps:
- uses: actions/checkout@v4
- name: Cache theme node_modules
Expand All @@ -110,7 +110,7 @@ jobs:
matrix: ${{fromJSON(needs.set_sites.outputs.matrix)}}
runs-on: ubuntu-latest
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
options: '--network-alias drupal8ci'
env:
REAL_AES_ENCRYPTION: ${{secrets.REAL_AES_ENCRYPTION}}
Expand Down Expand Up @@ -142,11 +142,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.x-${{ hashFiles('blt/blt.yml') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
runs-on: ubuntu-latest
needs: lint_theme
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
options: '--network-alias drupal8ci'
env:
REAL_AES_ENCRYPTION: ${{secrets.REAL_AES_ENCRYPTION}}
Expand Down Expand Up @@ -218,11 +218,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.x-${{ hashFiles('blt/blt.yml') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-
- run: git config --system --add safe.directory '*'
- name: Install Site
run: |
Expand Down Expand Up @@ -262,7 +262,7 @@ jobs:
- test_new_site
runs-on: ubuntu-latest
container:
image: pookmish/drupal8ci:latest
image: pookmish/drupal8ci:php8.3
options: '--network-alias drupal8ci'
steps:
- uses: actions/checkout@v4
Expand All @@ -274,11 +274,11 @@ jobs:
docroot/core
docroot/libraries
docroot/modules/contrib
key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
restore-keys: |
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.x-${{ hashFiles('blt/blt.yml') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
1.0-${{ hashFiles('blt/blt.yml') }}-
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
with:
Expand Down
33 changes: 29 additions & 4 deletions .tugboat/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ services:
- hs-colorful
- hs-traditional
- english
- history
- west

# A set of commands to run while building this service
commands:
Expand All @@ -43,17 +45,23 @@ services:
- rm -rf vendor
- composer install --no-ansi
- mysql -h mysql -P 3306 -u tugboat -ptugboat -e 'SET GLOBAL max_allowed_packet=67108864;'
# Sync to hs_colorful, hs_colorful and english database & files.
# Sync to hs_colorful, hs_colorful database & files and create user.
- blt drupal:sync:files --site=hs_colorful
- drush @hs_colorful.local user:create tugboat --password=tugboat || true
- drush @hs_colorful.local user:create tugboat --password=pushcar || true
- drush @hs_colorful.local user:role:add administrator tugboat || true

- blt drupal:sync:files --site=hs_traditional
- drush @hs_traditional.local user:create tugboat --password=tugboat || true
- drush @hs_traditional.local user:create tugboat --password=pushcar || true
- drush @hs_traditional.local user:role:add administrator tugboat || true


# Sync to english, history, and west database & files, does not create a user.
- blt drupal:sync:files --site=english

- blt drupal:sync:files --site=history

- blt drupal:sync:files --site=west


- chown -R www-data:www-data ${TUGBOAT_ROOT}/docroot/sites/*/files
build:
- rm -rf vendor
Expand All @@ -72,11 +80,22 @@ services:
- drush @english.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();'
- blt drupal:update --site=english

- drush @history.local cr
- drush @history.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();'
- blt drupal:update --site=history

- drush @west.local cr
- drush @west.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();'
- blt drupal:update --site=west

- npm run theme-build

# Collection of urls to compare visual results.
urls:
- /
- /mixed-pages/mixed-page-raised-cards
- /mixed-page-wells-raised-cards-full-width
- /mixed-pages/mixed-page-wells-raised-cards-full-width-sidebar

# What to call the service hosting MySQL. This name also acts as the
# hostname to access the service by from the php service.
Expand All @@ -91,6 +110,8 @@ services:
- mysql -e "DROP DATABASE IF EXISTS hs_colorful; CREATE DATABASE hs_colorful;"
- mysql -e "DROP DATABASE IF EXISTS hs_traditional; CREATE DATABASE hs_traditional;"
- mysql -e "DROP DATABASE IF EXISTS english; CREATE DATABASE english;"
- mysql -e "DROP DATABASE IF EXISTS history; CREATE DATABASE history;"
- mysql -e "DROP DATABASE IF EXISTS west; CREATE DATABASE west;"

# Give the tugboat user access to the new databases.
- mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'tugboat'; FLUSH PRIVILEGES;"
Expand All @@ -99,11 +120,15 @@ services:
- scp [email protected]:/mnt/gfs/humscigryphon.prod/backups/prod-hs_colorful-humscigrydb423120-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/hs_colorful.sql.gz
- scp [email protected]:/mnt/gfs/humscigryphon.prod/backups/prod-hs_traditional-humscigrydb423132-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/hs_traditional.sql.gz
- scp [email protected]:/mnt/gfs/humscigryphon.prod/backups/prod-english-humscigrydb423084-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/english.sql.gz
- scp [email protected]:/mnt/gfs/humscigryphon.prod/backups/prod-history-humscigrydb423116-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/history.sql.gz
- scp [email protected]:/mnt/gfs/humscigryphon.prod/backups/prod-west-humscigrydb423301-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/west.sql.gz

# Import each database dump into the associated table.
- zcat /tmp/hs_colorful.sql.gz | mysql hs_colorful
- zcat /tmp/hs_traditional.sql.gz | mysql hs_traditional
- zcat /tmp/english.sql.gz | mysql english
- zcat /tmp/history.sql.gz | mysql history
- zcat /tmp/west.sql.gz | mysql west

# Clean up after ourselves to keep the Preview size small.
- rm /tmp/*.sql.gz
Loading

0 comments on commit d2b2e50

Please sign in to comment.