Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drupal 10 Config updates #705

Merged
merged 6 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
uses: K-Phoen/semver-release-action@master
with:
release_strategy: none
release_branch: 10.x
tag_format: "10.%minor%.%patch%"
release_branch: 11.x
tag_format: "11.%minor%.%patch%"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: echo 'Creating new release for ' ${{ steps.tag.outputs.tag }}
Expand All @@ -32,3 +32,4 @@ jobs:
commit: ${{ github.sha }}
generateReleaseNotes: true
makeLatest: true

6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
env:
CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
run: |
composer global require su-sws/stanford-caravan:dev-8.x-3.x
composer global require su-sws/stanford-caravan:10.x-dev
~/.composer/vendor/bin/sws-caravan phpunit /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --with-coverage
- name: Save Test Results
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
env:
STANFORD_ENCRYPT: ${{ secrets.STANFORD_ENCRYPT }}
run: |
composer global require su-sws/stanford-caravan:dev-8.x-3.x
composer global require su-sws/stanford-caravan:10.x-dev
~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=acceptance
- name: Save Test Results
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
env:
STANFORD_ENCRYPT: ${{ secrets.STANFORD_ENCRYPT }}=
run: |
composer global require su-sws/stanford-caravan:dev-8.x-3.x
composer global require su-sws/stanford-caravan:10.x-dev
~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=functional
- name: Save Test Results
uses: actions/upload-artifact@v3
Expand Down
18 changes: 13 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"repositories": [
{
"type": "composer",
"url": "https://packages.drupal.org/8"
"url": "https://packages.drupal.org/8",
"exclude": ["drupal/display_field_copy"]
},
{
"type": "package",
Expand All @@ -33,6 +34,10 @@
"reference": "master"
}
}
},
{
"type": "vcs",
"url": "https://git.drupalcode.org/issue/display_field_copy-3287010.git"
}
],
"require": {
Expand All @@ -44,7 +49,7 @@
"composer/installers": ">=1.2",
"drupal/address": "^1.2",
"drupal/admin_toolbar": "^3.1",
"drupal/allowed_formats": "^2.0",
"drupal/allowed_formats": "^3.0",
"drupal/auto_entitylabel": "^3.0@beta",
"drupal/block_content_permissions": "^1.8",
"drupal/change_labels": "^1.0",
Expand All @@ -64,7 +69,7 @@
"drupal/cshs": "^4.0",
"drupal/default_content": "^2.0@alpha",
"drupal/diff": "^1.0@RC",
"drupal/display_field_copy": "^2.0",
"drupal/display_field_copy": "dev-3287010-automated-drupal-10 as 2.0.0",
"drupal/domain_301_redirect": "^2.0",
"drupal/ds": "^3.3",
"drupal/editoria11y": "^2.0",
Expand Down Expand Up @@ -154,11 +159,11 @@
"sainsburys/guzzle-oauth2-plugin": "^3.0",
"seboettg/citeproc-php": "2.4.1",
"su-sws/ckeditor5_plugins": "^1.0",
"su-sws/drupal-patches": "^8.1",
"su-sws/drupal-patches": "^10.0",
"su-sws/react_paragraphs": "^8.2",
"su-sws/stanford_actions": "^8.2",
"su-sws/stanford_fields": "^8.2",
"su-sws/stanford_media": "^9.0",
"su-sws/stanford_media": "^10.0",
"su-sws/stanford_migrate": "^8.3",
"su-sws/stanford_profile_helper": "^9.3",
"su-sws/stanford_samlauth": "^1.0"
Expand All @@ -183,6 +188,9 @@
}
},
"patches": {
"drupal/google_analytics": {
"https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
},
"drupal/hook_event_dispatcher": {
"https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://www.drupal.org/files/issues/2023-04-17/hook_event_dispatcher-4.x-3354751.patch"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ third_party_settings:
classes: ''
id: ''
open: false
description: 'The local footer''s lockup settings'
description: "The local footer's lockup settings"
required_fields: true
group_content_blocks:
children:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ content:
title: Paragraph
title_plural: Paragraphs
edit_mode: closed
closed_mode: summary
closed_mode: preview
autocollapse: none
closed_mode_threshold: 0
add_mode: button
Expand All @@ -136,7 +136,9 @@ content:
add_above: '0'
collapse_edit_all: '0'
duplicate: '0'
third_party_settings: { }
third_party_settings:
change_labels:
field_label_overwrite: ''
su_page_components:
type: layout_paragraphs
weight: 7
Expand Down
3 changes: 3 additions & 0 deletions config/sync/core.entity_view_display.media.image.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status: true
dependencies:
config:
- field.field.media.image.field_media_image
- field.field.media.image.su_media_category
- media.type.image
- responsive_image.styles.full_responsive
module:
Expand All @@ -21,6 +22,8 @@ content:
settings:
responsive_image_style: full_responsive
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
3 changes: 3 additions & 0 deletions config/sync/core.entity_view_display.media.video.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- core.entity_view_mode.media.full
- field.field.media.video.field_media_oembed_video
- field.field.media.video.su_media_category
- media.type.video
module:
- media
Expand All @@ -21,6 +22,8 @@ content:
settings:
max_width: 0
max_height: 0
loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
- field.field.node.stanford_course.su_course_section_units
- field.field.node.stanford_course.su_course_subject
- field.field.node.stanford_course.su_course_tags
- field.field.node.stanford_course.su_metatags
- field.field.node.stanford_course.su_shared_tags
- node.type.stanford_course
module:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
- field.field.node.stanford_course.su_course_section_units
- field.field.node.stanford_course.su_course_subject
- field.field.node.stanford_course.su_course_tags
- field.field.node.stanford_course.su_metatags
- field.field.node.stanford_course.su_shared_tags
- node.type.stanford_course
module:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,16 @@ third_party_settings:
allday_label: ''
date_first: '1'
ampm_reduce: 0
site_time_toggle: '1'
tooltip:
date_format: ''
custom_date_format: ''
time_diff:
enabled: false
future_format: '@interval hence'
past_format: '@interval ago'
granularity: 2
refresh: 60
third_party_settings:
field_formatter_class:
class: su-event-date
Expand Down Expand Up @@ -237,6 +247,16 @@ third_party_settings:
allday_label: ''
date_first: '0'
ampm_reduce: 0
site_time_toggle: '1'
tooltip:
date_format: ''
custom_date_format: ''
time_diff:
enabled: false
future_format: '@interval hence'
past_format: '@interval ago'
granularity: 2
refresh: 60
third_party_settings:
field_formatter_class:
class: su-event-time
Expand Down Expand Up @@ -560,8 +580,6 @@ third_party_settings:
- 'Content fields'
- 'Custom block types'
- 'Custom blocks'
- Devel
- 'Devel PHP'
- 'Events Lists (Views)'
- Forms
- Help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ langcode: en
status: true
dependencies:
config:
- field.field.node.stanford_event_series.field_menulink
- field.field.node.stanford_event_series.layout_builder__layout
- field.field.node.stanford_event_series.stanford_intranet__access
- field.field.node.stanford_event_series.su_event_series_components
Expand Down Expand Up @@ -184,8 +185,6 @@ third_party_settings:
- 'Content fields'
- 'Custom block types'
- 'Custom blocks'
- Devel
- 'Devel PHP'
- 'Events Lists (Views)'
- Forms
- Help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.search_indexing
- field.field.node.stanford_event_series.field_menulink
- field.field.node.stanford_event_series.layout_builder__layout
- field.field.node.stanford_event_series.stanford_intranet__access
- field.field.node.stanford_event_series.su_event_series_components
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.stanford_card
- field.field.node.stanford_event_series.field_menulink
- field.field.node.stanford_event_series.layout_builder__layout
- field.field.node.stanford_event_series.stanford_intranet__access
- field.field.node.stanford_event_series.su_event_series_components
Expand All @@ -12,6 +13,7 @@ dependencies:
- field.field.node.stanford_event_series.su_event_series_subheadline
- field.field.node.stanford_event_series.su_event_series_type
- field.field.node.stanford_event_series.su_event_series_weight
- field.field.node.stanford_event_series.su_metatags
- field.field.node.stanford_event_series.su_shared_tags
- node.type.stanford_event_series
module:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.teaser
- field.field.node.stanford_event_series.field_menulink
- field.field.node.stanford_event_series.layout_builder__layout
- field.field.node.stanford_event_series.stanford_intranet__access
- field.field.node.stanford_event_series.su_event_series_components
Expand All @@ -12,6 +13,7 @@ dependencies:
- field.field.node.stanford_event_series.su_event_series_subheadline
- field.field.node.stanford_event_series.su_event_series_type
- field.field.node.stanford_event_series.su_event_series_weight
- field.field.node.stanford_event_series.su_metatags
- field.field.node.stanford_event_series.su_shared_tags
- node.type.stanford_event_series
module:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,6 @@ third_party_settings:
- 'Content fields'
- 'Custom block types'
- 'Custom blocks'
- Devel
- 'Devel PHP'
- 'Events Lists (Views)'
- Forms
- Help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ dependencies:
- core.entity_view_mode.node.stanford_card
- field.field.node.stanford_news.layout_builder__layout
- field.field.node.stanford_news.stanford_intranet__access
- field.field.node.stanford_news.su_metatags
- field.field.node.stanford_news.su_news_banner
- field.field.node.stanford_news.su_news_banner_media_caption
- field.field.node.stanford_news.su_news_byline
- field.field.node.stanford_news.su_news_components
- field.field.node.stanford_news.su_news_dek
- field.field.node.stanford_news.su_news_featured_media
- field.field.node.stanford_news.su_news_hide_social
- field.field.node.stanford_news.su_news_publishing_date
- field.field.node.stanford_news.su_news_source
- field.field.node.stanford_news.su_news_topics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ langcode: en
status: true
dependencies:
config:
- field.field.node.stanford_page.field_menulink
- field.field.node.stanford_page.layout_builder__layout
- field.field.node.stanford_page.layout_selection
- field.field.node.stanford_page.stanford_intranet__access
Expand Down Expand Up @@ -155,8 +156,6 @@ third_party_settings:
- 'Content fields'
- 'Custom block types'
- 'Custom blocks'
- Devel
- 'Devel PHP'
- 'Events Lists (Views)'
- Forms
- Help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.search_indexing
- field.field.node.stanford_page.field_menulink
- field.field.node.stanford_page.layout_builder__layout
- field.field.node.stanford_page.layout_selection
- field.field.node.stanford_page.stanford_intranet__access
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ status: true
dependencies:
config:
- core.entity_view_mode.node.stanford_card
- field.field.node.stanford_page.field_menulink
- field.field.node.stanford_page.layout_builder__layout
- field.field.node.stanford_page.layout_selection
- field.field.node.stanford_page.stanford_intranet__access
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- core.base_field_override.node.stanford_person.title
- field.field.node.stanford_person.body
- field.field.node.stanford_person.field_menulink
- field.field.node.stanford_person.layout_builder__layout
- field.field.node.stanford_person.stanford_intranet__access
- field.field.node.stanford_person.su_metatags
Expand Down Expand Up @@ -624,8 +625,6 @@ third_party_settings:
- 'Content fields'
- 'Custom block types'
- 'Custom blocks'
- Devel
- 'Devel PHP'
- 'Events Lists (Views)'
- Forms
- Help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- core.entity_view_mode.node.search_indexing
- field.field.node.stanford_person.body
- field.field.node.stanford_person.field_menulink
- field.field.node.stanford_person.layout_builder__layout
- field.field.node.stanford_person.stanford_intranet__access
- field.field.node.stanford_person.su_metatags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ dependencies:
config:
- core.entity_view_mode.node.stanford_card
- field.field.node.stanford_person.body
- field.field.node.stanford_person.field_menulink
- field.field.node.stanford_person.layout_builder__layout
- field.field.node.stanford_person.stanford_intranet__access
- field.field.node.stanford_person.su_metatags
- field.field.node.stanford_person.su_person_academic_appt
- field.field.node.stanford_person.su_person_admin_appts
- field.field.node.stanford_person.su_person_affiliations
Expand All @@ -25,6 +27,7 @@ dependencies:
- field.field.node.stanford_person.su_person_mobile_phone
- field.field.node.stanford_person.su_person_photo
- field.field.node.stanford_person.su_person_profile_link
- field.field.node.stanford_person.su_person_pronouns
- field.field.node.stanford_person.su_person_research
- field.field.node.stanford_person.su_person_research_interests
- field.field.node.stanford_person.su_person_scholarly_interests
Expand Down
Loading
Loading