Skip to content

Commit

Permalink
Merge pull request #3509 from CityOfBoston/master
Browse files Browse the repository at this point in the history 
(production) Updates Captcha, Drupal Maintenance
  • Loading branch information
@davidrkupton
davidrkupton authored Jun 18, 2024
2 parents 2854f8f + c20cc35 commit cb85f36
Show file tree
Hide file tree
Showing 32 changed files with 2,280 additions and 2,406 deletions.
336 changes: 303 additions & 33 deletions .github/config/slack/slackDeployEnd.yml
View file

Large diffs are not rendered by default.

29 changes: 15 additions & 14 deletions .github/workflows/D10-Deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,32 @@ jobs:
run:
shell: bash
steps:

#
- name: Post to Slack
uses: act10ns/slack@v2.0.0
with:
status: Starting
channel: ${{ vars.SLACK_MONITORING_CHANNEL }}

#
- name: Output some debugging info
if: ${{ vars.DEBUG == 1 }}
run: |
export
pwd
#
# Install some dependencies.
- name: Install additional Linux packages
run: |
sudo add-apt-repository ppa:ondrej/php
sudo apt-get update
sudo apt-get install -y -q libgd3 php-gd php-curl libpng-dev libjpeg-dev libwebp-dev
#
# More debugging (full PHP configuration)
- name: Output more debugging info
if: ${{ vars.DEBUG == 1 }}
run: |
php -i
#
# checkout the cob repository that has been pushed to.
- name: Checkout the repository
uses: actions/checkout@v4
Expand All @@ -81,7 +81,7 @@ jobs:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 1 # 0 = all
path: candidate # Checkout into this folder

#
# checkout the private repository which has settings and secrets etc
- name: Checkout the private repository
uses: actions/checkout@v4
Expand All @@ -92,7 +92,7 @@ jobs:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 1 # 0 = all
path: private # Checkout into this folder

#
# Merge the private repo into the tracked repo
- name: Merge the private repo files
run: |
Expand All @@ -103,14 +103,14 @@ jobs:
rsync -aE ./private/ ./candidate/ --exclude=*.md
rm -rf ./private
ls -la ./candidate/docroot/sites/default/settings
#
# Cache Composer Dependencies
- name: Cache Composer dependencies
uses: actions/cache@v3
with:
path: /tmp/composer-cache
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}

#
# Composer Install: Note: has an SSH option for private repos
- name: Download Drupal and dependencies
id: Build-drupal-using-Composer
Expand All @@ -119,11 +119,12 @@ jobs:
USE_DEV: "yes"
with:
dev: ${{ env.USE_DEV }} # download dev packages when used on dev environments
args: --prefer-dist --no-interaction --no-progress --ignore-platform-req=ext-gd --ignore-platform-req=ext-soap
args: --prefer-dist --no-interaction --no-progress # --ignore-platform-req=ext-gd --ignore-platform-req=ext-soap
php_extensions: gd soap
working_dir: candidate
version: 2.5.8
php_version: 8.3

version: "2.7.6"
php_version: "8.3"
#
# Composer drupal:scaffold
- name: Install Drupal Scaffold
uses: php-actions/composer@v6
Expand All @@ -140,7 +141,7 @@ jobs:
# echo "Directory Listing for $(pwd)/candidate/docroot/modules/contrib" && ls -lAh --group-directories-first candidate/docroot/modules/contrib
# echo "Directory Listing for $(pwd)/candidate/docroot/sites/default" && ls -lAh --group-directories-first candidate/docroot/sites/default
# echo "Directory Listing for $(pwd)/candidate/docroot/sites/default/settings" && ls -lAh --group-directories-first candidate/docroot/sites/default/settings
#
# checkout the acquia repository to push to.
- name: Checkout the Acquia repository
id: Checkout-Acquia-Repo
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/D10-GeneratePrivateRelease.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
MakeRelease:
# installed software: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
defaults:
run:
shell: bash
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/D10-GeneratePublicRelease.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
MakeRelease:
# installed software: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
defaults:
run:
shell: bash
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/D10-Publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,8 @@ jobs:
ok=$(git tag --list | grep $ACQUIA_TAG) || break
[[ $count -gt 10 ]] && exit 100
done
RELEASE_NUMBER="v10.$(date +%Y).${{ vars.COUNT }}"
[ -n "${{ github.event.pull_request.title }}" ] && TITLE="${{ github.event.pull_request.title }}" || TITLE="Boston.gov Update"
[ -n "${{ github.event.pull_request.body }}" ] && BODY="${{ github.event.pull_request.body }}" || BODY="PR committed and merged."
gh variable set LAST_TAG --body "${{ vars.THIS_TAG }}"
gh variable set LAST_RELEASE --body "${{ vars.THIS_RELEASE }}"
echo "THIS_TAG=\"$ACQUIA_TAG\"" >> "${GITHUB_ENV}"
echo "THIS_RELEASE=\"$RELEASE_NUMBER\"" >> "${GITHUB_ENV}"
echo "THIS_TITLE=\"$TITLE\"" >> "${GITHUB_ENV}"
echo "THIS_BODY=\"$BODY\"" >> "${GITHUB_ENV}"
echo "THIS_RELEASE=\"v10.$(date +%Y).${{ vars.COUNT }}\"" >> "${GITHUB_ENV}"
#
# Clone the Public Repository and checkout branch
Expand Down Expand Up @@ -180,7 +173,7 @@ jobs:
[[ ${{ vars.DEBUG }} == 1 ]] && commitopt="--status" || commitopt="--quiet"
commitopt="$commitopt --no-verify --signoff"
res=$(git commit -m '${{ env.THIS_TITLE }}' $commitopt) || err="$err: Problem committing changes"
res=$(git commit -m '${{ github.event.pull_request.title }}' $commitopt) || err="$err: Problem committing changes"
pushopts="--force"
if [[ ${{ vars.DEBUG }} == 1 ]]; then
Expand Down Expand Up @@ -217,11 +210,13 @@ jobs:
if: ${{ success() && vars.DRY_RUN == 0 }}
run: |
cd private
gh variable set LAST_TAG --body "${{ vars.THIS_TAG }}"
gh variable set LAST_RELEASE --body "${{ vars.THIS_RELEASE }}"
gh variable set COUNT --body $(( ${{ vars.COUNT }}+1 ))
gh variable set THIS_TAG --body "${{ env.THIS_TAG }}"
gh variable set THIS_RELEASE --body "${{ env.THIS_RELEASE }}"
gh variable set THIS_TITLE --body "${{ env.THIS_TITLE }}"
gh variable set THIS_BODY --body "${{ env.THIS_BODY }}"
gh variable set THIS_TITLE --body "${{ github.event.pull_request.title }}"
gh variable set THIS_BODY --body "${{ github.event.pull_request.body }}"
#
# If failure, post to slack.
Expand Down
42 changes: 20 additions & 22 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@
"type": "composer",
"url": "https://asset-packagist.org"
},
{
"type": "github",
"url": "git@github.com:CityOfBoston/contextual_range_filter.git",
"vendor-alias": "cityofboston"
},
{
"type": "package",
"package": {
Expand Down Expand Up @@ -58,13 +53,12 @@
}
],
"require": {
"cityofboston/contextual_range_filter": "dev-drupal10-compat",
"composer-plugin-api": "^2.6",
"composer/installers": "^1.6",
"cweagans/composer-patches": "^1.7",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"drupal/acquia_connector": "^4.0",
"drupal/acquia_purge": "^1.0",
"drupal/acquia_telemetry-acquia_telemetry": "1.0.0-alpha6",
"drupal/address": "^1.4",
"drupal/addtocal": "^3.0@beta",
"drupal/admin_toolbar": "^3.1",
Expand All @@ -73,7 +67,7 @@
"drupal/advanced_text_formatter": "^3.0@RC",
"drupal/ape": "^1.6",
"drupal/autologout": "^1.0",
"drupal/autosave_form": "1.4.0",
"drupal/autosave_form": "^1.4",
"drupal/better_exposed_filters": "^6.0",
"drupal/bg_image_formatter": "^1.1",
"drupal/chosen": "^3.0",
Expand All @@ -86,9 +80,10 @@
"drupal/config_split": "^2.0@RC",
"drupal/config_update": "^2.0@alpha",
"drupal/conflict": "2.0.0-alpha3",
"drupal/contact_storage": "1.3.0",
"drupal/contact_storage": "^1.3",
"drupal/content_access": "^2.0@RC",
"drupal/content_moderation_notifications": "^3.5",
"drupal/contextual_range_filter": "^2.0",
"drupal/core": "^10.2",
"drupal/core-composer-scaffold": "^9.1",
"drupal/ctools": "^3.0",
Expand All @@ -97,12 +92,12 @@
"drupal/date_recur_modular": "^3.0",
"drupal/diff": "^1.0",
"drupal/draggableviews": "^2.0",
"drupal/dropzonejs": "2.8.0",
"drupal/dropzonejs": "^2.10",
"drupal/dynamic_entity_reference": "^3.0",
"drupal/editor_advanced_link": "^2.0",
"drupal/editor_file": "^1.4",
"drupal/entity": "^1.0",
"drupal/entity_block": "1.1.0",
"drupal/entity_block": "^1.1",
"drupal/entity_browser": "^2.0",
"drupal/entity_browser_block": "^1",
"drupal/entity_clone": "^2.0",
Expand All @@ -119,7 +114,7 @@
"drupal/google_tag": "^1.0",
"drupal/honeypot": "^2.1",
"drupal/image_url_formatter": "^1.0",
"drupal/image_widget_crop": "2.4.0",
"drupal/image_widget_crop": "^2.4",
"drupal/imagemagick": "^3.2.0",
"drupal/inline_entity_form": "^1.0@beta",
"drupal/jquery_ui_accordion": "^2.0",
Expand All @@ -130,7 +125,7 @@
"drupal/layout_builder_restrictions": "2.19.0",
"drupal/layout_builder_st": "^1.0-alpha2",
"drupal/layout_builder_styles": "^2.0",
"drupal/layout_library": "1.0.0-beta4",
"drupal/layout_library": "^1.0@beta",
"drupal/libraries": "^4.0",
"drupal/lightning_core": "^6",
"drupal/lightning_layout": "~3.0.0",
Expand All @@ -142,8 +137,8 @@
"drupal/mailsystem": "^4.4",
"drupal/masquerade": "^2.0@RC",
"drupal/media_entity_browser": "^2.0",
"drupal/media_entity_instagram": "3.0.8",
"drupal/media_entity_twitter": "2.9.0",
"drupal/media_entity_instagram": "^3.0",
"drupal/media_entity_twitter": "^2.9",
"drupal/memcache": "^2.0",
"drupal/menu_block": "^1.5",
"drupal/metatag": "^1",
Expand All @@ -155,7 +150,7 @@
"drupal/node_revision_delete": "^2.0@alpha",
"drupal/office_hours": "^1.1",
"drupal/panelizer": "^4.1 || ^5",
"drupal/panels": "4.7.0",
"drupal/panels": "^4.7",
"drupal/paragraphs": "^1.15",
"drupal/paragraphs_browser": "^1.1",
"drupal/paragraphs_edit": "^3.0",
Expand All @@ -168,7 +163,7 @@
"drupal/r4032login": "^2.2",
"drupal/rabbit_hole": "^1.0-beta5",
"drupal/realname": "^2.0@beta",
"drupal/recaptcha": "^3.2",
"drupal/recaptcha": "3.x-dev@dev",
"drupal/recaptcha_v3": "^1.8",
"drupal/redirect": "^1.2",
"drupal/rest_export_nested": "^1.0",
Expand All @@ -177,12 +172,12 @@
"drupal/salesforce": "5.0.3",
"drupal/samlauth": "^3.0",
"drupal/schema_metatag": "^2.2",
"drupal/search_api": "1.30.0",
"drupal/search_api": "^1.34",
"drupal/seckit": "^2.0",
"drupal/seven": "^1.0",
"drupal/shortcode": "^2.0",
"drupal/simple_gmap": "3.1.0",
"drupal/slick_entityreference": "2.1.0",
"drupal/simple_gmap": "^3.1",
"drupal/slick_entityreference": "^2.1",
"drupal/smart_trim": "^2.1",
"drupal/social_media": "^2.0",
"drupal/sophron": "^2.0",
Expand All @@ -202,7 +197,7 @@
"drupal/votingapi": "^3.0",
"drupal/webform": "^6.2@beta",
"drupal/workbench": "^1.0",
"drupal/workflow": "^1.1_",
"drupal/workflow": "^1.1",
"drupal/xmlsitemap": "^1.0",
"drush/drush": "*",
"enyo/dropzone": "^5.7.4",
Expand All @@ -221,7 +216,7 @@
},
"require-dev": {
"drupal/config_devel": "^1.2",
"drupal/core-dev": "^10",
"drupal/core-dev": "^10.2",
"drupal/devel": "^5.0",
"drupal/upgrade_status": "^4.0",
"phpspec/prophecy-phpunit": "^2",
Expand Down Expand Up @@ -295,6 +290,9 @@
"Patch for Type error DIG-3707 Dec 2023 Stella": "https://www.drupal.org/files/issues/2023-07-07/3372354-fix-addtocal-download.patch",
"Part two - menu not opening patch for Type error DIG-3707 - Dec 2023 Stella": "patches/dig-3707a.patch"
},
"drupal/recaptcha": {
"3449033. Enable Google Enterprise Cloud. DIG-4455 - DU June 2024": "https://www.drupal.org/files/issues/2024-06-03/recaptcha-enterprise-3449033-2.patch"
},
"drupal/core": {
"CoB patch - Fix original node is null on migration.": "patches/cob_migration_missing_original_001.patch",
"Optional end-date in date_range field type": "https://www.drupal.org/files/issues/2020-08-09/2794481-109.patch",
Expand Down
Loading

0 comments on commit cb85f36

Please sign in to comment.