diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 30b3e68..6cef1e2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - '2.x' + workflow_dispatch: env: LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_core @@ -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: @@ -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: @@ -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: @@ -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: @@ -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 }}" diff --git a/localgov_core.info.yml b/localgov_core.info.yml index 81659e9..bcd4f69 100644 --- a/localgov_core.info.yml +++ b/localgov_core.info.yml @@ -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 diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.default.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.default.yml index 411c5a3..e776a49 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.default.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.default.yml @@ -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 diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml index 13e7d07..cc1e96e 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml @@ -19,6 +19,8 @@ content: settings: responsive_image_style: freestyle_responsive image_link: '' + image_loading: + attribute: lazy third_party_settings: { } weight: 1 region: content diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.localgov_featured_large.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.localgov_featured_large.yml index 89b6258..cba4a89 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.localgov_featured_large.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.localgov_featured_large.yml @@ -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 diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_3x2.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_3x2.yml index 1f797a7..7beee29 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_3x2.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_3x2.yml @@ -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 diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_banner.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_banner.yml index 1345a3e..5e23d94 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_banner.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.responsive_banner.yml @@ -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 diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.square.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.square.yml index 84315ed..05036bc 100644 --- a/modules/localgov_media/config/optional/core.entity_view_display.media.image.square.yml +++ b/modules/localgov_media/config/optional/core.entity_view_display.media.image.square.yml @@ -19,6 +19,8 @@ content: settings: responsive_image_style: square image_link: '' + image_loading: + attribute: lazy third_party_settings: {} weight: 1 region: content diff --git a/modules/localgov_media/config/optional/field.field.media.document.field_media_document.yml b/modules/localgov_media/config/optional/field.field.media.document.field_media_document.yml index 80a3646..b8cf02c 100644 --- a/modules/localgov_media/config/optional/field.field.media.document.field_media_document.yml +++ b/modules/localgov_media/config/optional/field.field.media.document.field_media_document.yml @@ -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: { } diff --git a/modules/localgov_media/tests/src/Functional/MediaSetupTest.php b/modules/localgov_media/tests/src/Functional/MediaSetupTest.php index ea226cf..3bcd8ff 100644 --- a/modules/localgov_media/tests/src/Functional/MediaSetupTest.php +++ b/modules/localgov_media/tests/src/Functional/MediaSetupTest.php @@ -1,6 +1,6 @@