Skip to content

Commit

Permalink
Merge pull request #209 from localgovdrupal/2.x
Browse files Browse the repository at this point in the history
2.13.1 release
  • Loading branch information
finnlewis committed Mar 19, 2024
2 parents 50aece6 + eefa856 commit fc933f9
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 32 deletions.
59 changes: 30 additions & 29 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
branches:
- '2.x'
workflow_dispatch:

env:
LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_core
Expand All @@ -21,13 +22,13 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
- localgov-version: '2.x'
drupal-version: '~9.4'
php-version: '8.1'
- localgov-version: '3.x'
drupal-version: '~10.0'
php-version: '8.1'
localgov-version:
- '3.x'
drupal-version:
- '~10.1'
php-version:
- '8.1'
- '8.2'

steps:

Expand Down Expand Up @@ -105,13 +106,13 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
- localgov-version: '2.x'
drupal-version: '~9.4'
php-version: '8.1'
- localgov-version: '3.x'
drupal-version: '~10.0'
php-version: '8.1'
localgov-version:
- '3.x'
drupal-version:
- '~10.1'
php-version:
- '8.1'
- '8.2'

steps:

Expand Down Expand Up @@ -141,13 +142,13 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
- localgov-version: '2.x'
drupal-version: '~9.4'
php-version: '8.1'
- localgov-version: '3.x'
drupal-version: '~10.0'
php-version: '8.1'
localgov-version:
- '3.x'
drupal-version:
- '~10.1'
php-version:
- '8.1'
- '8.2'

steps:

Expand Down Expand Up @@ -176,13 +177,13 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
- localgov-version: '2.x'
drupal-version: '~9.4'
php-version: '8.1'
- localgov-version: '3.x'
drupal-version: '~10.0'
php-version: '8.1'
localgov-version:
- '3.x'
drupal-version:
- '~10.1'
php-version:
- '8.1'
- '8.2'

steps:

Expand All @@ -208,4 +209,4 @@ jobs:
mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
2 changes: 1 addition & 1 deletion localgov_core.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: LocalGov Core
description: LocalGov Drupal helper functions and core dependencies.
package: LocalGov Drupal
type: module
core_version_requirement: ^9 || ^10
core_version_requirement: ^10.1

dependencies:
- drupal:block
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ content:
settings:
responsive_image_style: 3_2_image
image_link: ''
image_loading:
attribute: lazy
third_party_settings: {}
weight: 1
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ content:
settings:
responsive_image_style: freestyle_responsive
image_link: ''
image_loading:
attribute: lazy
third_party_settings: { }
weight: 1
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ content:
settings:
responsive_image_style: localgov_newsroom_featured
image_link: ''
image_loading:
attribute: lazy
third_party_settings: {}
weight: 1
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ content:
settings:
responsive_image_style: 3_2_image
image_link: ''
image_loading:
attribute: lazy
third_party_settings: {}
weight: 1
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ content:
settings:
responsive_image_style: banner_28_9
image_link: ''
image_loading:
attribute: lazy
third_party_settings: {}
weight: 1
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ content:
settings:
responsive_image_style: square
image_link: ''
image_loading:
attribute: lazy
third_party_settings: {}
weight: 1
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ default_value: { }
default_value_callback: ''
settings:
file_directory: '[date:custom:Y]-[date:custom:m]'
file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages'
file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages csv'
max_filesize: ''
handler: 'default:file'
handler_settings: { }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

declare(strict_types = 1);
declare(strict_types=1);

namespace Drupal\Tests\localgov_media\Functional;

Expand Down
5 changes: 5 additions & 0 deletions modules/localgov_roles/src/RolesHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ class RolesHelper {
*/
const CONTRIBUTOR_ROLE = 'localgov_contributor';

/**
* User manager role machine name.
*/
const USER_MANAGER_ROLE = 'localgov_user_manager';

/**
* Assign permissions to roles if module has defaults.
*/
Expand Down

0 comments on commit fc933f9

Please sign in to comment.