Skip to content

Commit

Permalink
Merge branch 'release/3.x/3.20.0' into 3.x-master
Browse files Browse the repository at this point in the history
  • Loading branch information
Ruwan committed Dec 2, 2024
2 parents 637f7f9 + be255d0 commit a8a6cdd
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 14 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/release_branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: GovCMS Release Branch Check

on:
push:
branches: 'release/**'

permissions:
contents: read


jobs:
check-branch-name:
runs-on: ubuntu-latest

steps:
- name: Check release branch name format
run: |
echo "Current branch is ${GITHUB_REF}"
REGEX="^refs/heads/release/([0-9]+)\.x/([0-9]+)\.[0-9]+\.[0-9]+$"
if [[ "$GITHUB_REF" =~ $REGEX ]]; then
major_ver=${BASH_REMATCH[1]}
rep_major_ver=${BASH_REMATCH[2]}
if [[ "$major_ver" == "$rep_major_ver" ]]; then
echo "Correct release branch name format"
else
echo "Incorrect release branch name format"
exit 1
fi
else
echo "Incorrect release branch name format"
exit 1
fi
check-version:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Get GovCMS version
id: getGovcmsVersion
uses: mikefarah/yq@master
with:
cmd: yq '.version' 'govcms.info.yml'
- name: Check branch and govcms version are equal
run: |
G_VERSION=${{ steps.getGovcmsVersion.outputs.result }}
echo "GovCMS version defined as ${G_VERSION}"
echo "Current branch is ${GITHUB_REF}"
B_VERSION=$(echo $GITHUB_REF | cut -d '/' -f 5)
echo "Branch version is set to ${B_VERSION}"
if [ "$G_VERSION" != "$B_VERSION" ]; then
echo "GovCMS and Branch versions are not equal."
exit 1
fi
38 changes: 25 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"cweagans/composer-patches": "^1.7",
"govcms-assets/dropzone": "5.7.2",
"drupal/address": "2.0.2",
"drupal/admin_toolbar": "3.5.0",
"drupal/admin_toolbar": "3.5.1",
"drupal/bigmenu": "2.0.0-rc3",
"drupal/block_inactive_users": "2.7.0",
"drupal/captcha": "2.0.6",
Expand All @@ -37,25 +37,26 @@
"drupal/consumers": "1.19.0",
"drupal/contact_storage": "1.4.0",
"drupal/context": "5.0.0-rc1",
"drupal/core-composer-scaffold": "10.3.6",
"drupal/core-recommended": "10.3.6",
"drupal/core-composer-scaffold": "10.3.10",
"drupal/core-recommended": "10.3.10",
"drupal/crop": "2.4.0",
"drupal/ctools": "4.1.0",
"drupal/devel": "5.1.2",
"drupal/devel": "5.3.1",
"drupal/diff": "1.8.0",
"drupal/dropzonejs": "2.11.0",
"drupal/ds": "3.24.0",
"drupal/dynamic_entity_reference": "3.2.0",
"drupal/embed": "1.9.0",
"drupal/encrypt": "3.2.0",
"drupal/entity_browser": "2.11.0",
"drupal/entity_browser": "2.12.0",
"drupal/entity_class_formatter": "2.0.1",
"drupal/entity_embed": "1.6.0",
"drupal/entity_hierarchy": "3.3.11",
"drupal/entity_reference_display": "2.0.2",
"drupal/entity_reference_revisions": "1.12.0",
"drupal/environment_indicator": "4.0.19",
"drupal/events_log_track": "3.1.9",
"drupal/externalauth":"2.0.6",
"drupal/facets": "2.0.9",
"drupal/field_group": "3.6.0",
"drupal/file_to_media": "1.0.3",
Expand All @@ -65,10 +66,10 @@
"drupal/inline_entity_form": "3.0.0-rc20",
"drupal/honeypot": "2.1.4",
"drupal/key": "1.19.0",
"drupal/layout_builder_modal": "1.2.0",
"drupal/layout_builder_modal": "2.0.0",
"drupal/layout_builder_restrictions": "2.20.0",
"drupal/linked_field": "1.5.0",
"drupal/linkit": "6.1.4",
"drupal/linkit": "6.1.6",
"drupal/login_security": "2.0.2",
"drupal/mailsystem": "4.5.0",
"drupal/media_bulk_upload": "3.0.2",
Expand All @@ -77,7 +78,7 @@
"drupal/media_vimeo_domain_privacy": "1.1",
"drupal/menu_block": "1.13.0",
"drupal/menu_trail_by_path": "2.1.0",
"drupal/metatag": "2.0.2",
"drupal/metatag": "2.1.0",
"drupal/migrate_file": "2.1.2",
"drupal/migrate_plus": "6.0.4",
"drupal/migrate_source_csv": "3.6.0",
Expand All @@ -98,21 +99,23 @@
"drupal/role_delegation": "1.3.0",
"drupal/search_api": "1.35.0",
"drupal/search_api_solr": "4.3.5",
"drupal/scheduled_transitions": "2.5.0",
"drupal/search_api_attachments": "9.0.3",
"drupal/scheduled_transitions": "2.7.0",
"drupal/search_api_attachments": "9.0.5",
"drupal/seckit": "2.0.3",
"drupal/securitytxt": "1.6.0",
"drupal/shield": "1.8.0",
"drupal/simple_oauth": "5.2.5",
"drupal/simple_sitemap": "4.2.1",
"drupal/symfony_mailer": "1.4.1",
"drupal/simplesamlphp_auth": "4.0.0",
"drupal/symfony_mailer": "1.5.0",
"drupal/token": "1.15.0",
"drupal/tfa": "1.8.0",
"drupal/twig_tweak": "3.3.0",
"drupal/tfa": "1.9.0",
"drupal/twig_tweak": "3.4.0",
"drupal/username_enumeration_prevention": "1.4.0",
"drupal/webform": "6.2.7",
"govcms-assets/chosen": "2.2.1",
"oomphinc/composer-installers-extender": "^2.0",
"simplesamlphp/simplesamlphp": "2.3.2",
"webflo/drupal-finder": "^1.2"
},
"require-dev": {
Expand All @@ -129,6 +132,8 @@
"drupal/core-vendor-hardening": true,
"phpstan/extension-installer": true,
"php-http/discovery": true,
"simplesamlphp/composer-module-installer": false,
"simplesamlphp/composer-xmlprovider-installer": false,
"tbachert/spi": true
},
"bin-dir": "bin/",
Expand All @@ -154,6 +159,13 @@
"enable-patching": true,
"composer-exit-on-patch-failure": true,
"patches": {
"drupal/facets": {
"Creating requests causes failures on Drupal 10.3 - https://www.drupal.org/project/facets/issues/3466281": "https://www.drupal.org/files/issues/2024-11-21/3466281-7.patch"
},
"drupal/password_policy": {
"Apply password policies for SSO users - https://www.drupal.org/project/password_policy/issues/3366169": "https://www.drupal.org/files/issues/2024-07-25/password_policy-3366169-8.patch",
"AJAX error when password field is hidden - https://www.drupal.org/project/password_policy/issues/3442714": "https://www.drupal.org/files/issues/2024-07-26/password_policy-3442714-7.patch"
},
"drupal/tfa": {
"Create Email one-time-code Validation Plugin & related Setup Plugin - https://www.drupal.org/project/tfa/issues/2930541": "https://www.drupal.org/files/issues/2023-07-19/tfa-2930541-81.patch"
}
Expand Down
6 changes: 6 additions & 0 deletions config/optional/simplesamlphp_auth.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
allow:
set_drupal_pwd: false
login_link_show: false
register_users: false
secure: true
httponly: true
2 changes: 1 addition & 1 deletion govcms.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ type: profile
description: 'A GovCMS Drupal Distribution for government and the public sector in Australia.'
core_version_requirement: ^10
project: 'govcms'
version: '3.19.0'
version: '3.20.0'

distribution:
name: GovCMS
Expand Down

0 comments on commit a8a6cdd

Please sign in to comment.