Skip to content

Commit a8a6cdd

Browse files
author
Ruwan
committed
Merge branch 'release/3.x/3.20.0' into 3.x-master
2 parents 637f7f9 + be255d0 commit a8a6cdd

File tree

4 files changed

+87
-14
lines changed

4 files changed

+87
-14
lines changed

‎.github/workflows/release_branch.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: GovCMS Release Branch Check
2+
3+
on:
4+
push:
5+
branches: 'release/**'
6+
7+
permissions:
8+
contents: read
9+
10+
11+
jobs:
12+
check-branch-name:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Check release branch name format
17+
run: |
18+
echo "Current branch is ${GITHUB_REF}"
19+
REGEX="^refs/heads/release/([0-9]+)\.x/([0-9]+)\.[0-9]+\.[0-9]+$"
20+
if [[ "$GITHUB_REF" =~ $REGEX ]]; then
21+
major_ver=${BASH_REMATCH[1]}
22+
rep_major_ver=${BASH_REMATCH[2]}
23+
if [[ "$major_ver" == "$rep_major_ver" ]]; then
24+
echo "Correct release branch name format"
25+
else
26+
echo "Incorrect release branch name format"
27+
exit 1
28+
fi
29+
else
30+
echo "Incorrect release branch name format"
31+
exit 1
32+
fi
33+
34+
check-version:
35+
runs-on: ubuntu-latest
36+
37+
steps:
38+
- name: Checkout repository
39+
uses: actions/checkout@v4
40+
- name: Get GovCMS version
41+
id: getGovcmsVersion
42+
uses: mikefarah/yq@master
43+
with:
44+
cmd: yq '.version' 'govcms.info.yml'
45+
- name: Check branch and govcms version are equal
46+
run: |
47+
G_VERSION=${{ steps.getGovcmsVersion.outputs.result }}
48+
echo "GovCMS version defined as ${G_VERSION}"
49+
echo "Current branch is ${GITHUB_REF}"
50+
B_VERSION=$(echo $GITHUB_REF | cut -d '/' -f 5)
51+
echo "Branch version is set to ${B_VERSION}"
52+
if [ "$G_VERSION" != "$B_VERSION" ]; then
53+
echo "GovCMS and Branch versions are not equal."
54+
exit 1
55+
fi

‎composer.json

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"cweagans/composer-patches": "^1.7",
2323
"govcms-assets/dropzone": "5.7.2",
2424
"drupal/address": "2.0.2",
25-
"drupal/admin_toolbar": "3.5.0",
25+
"drupal/admin_toolbar": "3.5.1",
2626
"drupal/bigmenu": "2.0.0-rc3",
2727
"drupal/block_inactive_users": "2.7.0",
2828
"drupal/captcha": "2.0.6",
@@ -37,25 +37,26 @@
3737
"drupal/consumers": "1.19.0",
3838
"drupal/contact_storage": "1.4.0",
3939
"drupal/context": "5.0.0-rc1",
40-
"drupal/core-composer-scaffold": "10.3.6",
41-
"drupal/core-recommended": "10.3.6",
40+
"drupal/core-composer-scaffold": "10.3.10",
41+
"drupal/core-recommended": "10.3.10",
4242
"drupal/crop": "2.4.0",
4343
"drupal/ctools": "4.1.0",
44-
"drupal/devel": "5.1.2",
44+
"drupal/devel": "5.3.1",
4545
"drupal/diff": "1.8.0",
4646
"drupal/dropzonejs": "2.11.0",
4747
"drupal/ds": "3.24.0",
4848
"drupal/dynamic_entity_reference": "3.2.0",
4949
"drupal/embed": "1.9.0",
5050
"drupal/encrypt": "3.2.0",
51-
"drupal/entity_browser": "2.11.0",
51+
"drupal/entity_browser": "2.12.0",
5252
"drupal/entity_class_formatter": "2.0.1",
5353
"drupal/entity_embed": "1.6.0",
5454
"drupal/entity_hierarchy": "3.3.11",
5555
"drupal/entity_reference_display": "2.0.2",
5656
"drupal/entity_reference_revisions": "1.12.0",
5757
"drupal/environment_indicator": "4.0.19",
5858
"drupal/events_log_track": "3.1.9",
59+
"drupal/externalauth":"2.0.6",
5960
"drupal/facets": "2.0.9",
6061
"drupal/field_group": "3.6.0",
6162
"drupal/file_to_media": "1.0.3",
@@ -65,10 +66,10 @@
6566
"drupal/inline_entity_form": "3.0.0-rc20",
6667
"drupal/honeypot": "2.1.4",
6768
"drupal/key": "1.19.0",
68-
"drupal/layout_builder_modal": "1.2.0",
69+
"drupal/layout_builder_modal": "2.0.0",
6970
"drupal/layout_builder_restrictions": "2.20.0",
7071
"drupal/linked_field": "1.5.0",
71-
"drupal/linkit": "6.1.4",
72+
"drupal/linkit": "6.1.6",
7273
"drupal/login_security": "2.0.2",
7374
"drupal/mailsystem": "4.5.0",
7475
"drupal/media_bulk_upload": "3.0.2",
@@ -77,7 +78,7 @@
7778
"drupal/media_vimeo_domain_privacy": "1.1",
7879
"drupal/menu_block": "1.13.0",
7980
"drupal/menu_trail_by_path": "2.1.0",
80-
"drupal/metatag": "2.0.2",
81+
"drupal/metatag": "2.1.0",
8182
"drupal/migrate_file": "2.1.2",
8283
"drupal/migrate_plus": "6.0.4",
8384
"drupal/migrate_source_csv": "3.6.0",
@@ -98,21 +99,23 @@
9899
"drupal/role_delegation": "1.3.0",
99100
"drupal/search_api": "1.35.0",
100101
"drupal/search_api_solr": "4.3.5",
101-
"drupal/scheduled_transitions": "2.5.0",
102-
"drupal/search_api_attachments": "9.0.3",
102+
"drupal/scheduled_transitions": "2.7.0",
103+
"drupal/search_api_attachments": "9.0.5",
103104
"drupal/seckit": "2.0.3",
104105
"drupal/securitytxt": "1.6.0",
105106
"drupal/shield": "1.8.0",
106107
"drupal/simple_oauth": "5.2.5",
107108
"drupal/simple_sitemap": "4.2.1",
108-
"drupal/symfony_mailer": "1.4.1",
109+
"drupal/simplesamlphp_auth": "4.0.0",
110+
"drupal/symfony_mailer": "1.5.0",
109111
"drupal/token": "1.15.0",
110-
"drupal/tfa": "1.8.0",
111-
"drupal/twig_tweak": "3.3.0",
112+
"drupal/tfa": "1.9.0",
113+
"drupal/twig_tweak": "3.4.0",
112114
"drupal/username_enumeration_prevention": "1.4.0",
113115
"drupal/webform": "6.2.7",
114116
"govcms-assets/chosen": "2.2.1",
115117
"oomphinc/composer-installers-extender": "^2.0",
118+
"simplesamlphp/simplesamlphp": "2.3.2",
116119
"webflo/drupal-finder": "^1.2"
117120
},
118121
"require-dev": {
@@ -129,6 +132,8 @@
129132
"drupal/core-vendor-hardening": true,
130133
"phpstan/extension-installer": true,
131134
"php-http/discovery": true,
135+
"simplesamlphp/composer-module-installer": false,
136+
"simplesamlphp/composer-xmlprovider-installer": false,
132137
"tbachert/spi": true
133138
},
134139
"bin-dir": "bin/",
@@ -154,6 +159,13 @@
154159
"enable-patching": true,
155160
"composer-exit-on-patch-failure": true,
156161
"patches": {
162+
"drupal/facets": {
163+
"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"
164+
},
165+
"drupal/password_policy": {
166+
"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",
167+
"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"
168+
},
157169
"drupal/tfa": {
158170
"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"
159171
}

‎config/optional/simplesamlphp_auth.settings.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
allow:
2+
set_drupal_pwd: false
3+
login_link_show: false
4+
register_users: false
5+
secure: true
6+
httponly: true

‎govcms.info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ type: profile
33
description: 'A GovCMS Drupal Distribution for government and the public sector in Australia.'
44
core_version_requirement: ^10
55
project: 'govcms'
6-
version: '3.19.0'
6+
version: '3.20.0'
77

88
distribution:
99
name: GovCMS

0 commit comments

Comments
 (0)