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

Dev to main #817

Merged
merged 52 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
c17e85f
UHF-9546: New test and staging addresses
tuutti Feb 13, 2024
28555e0
UHF-9546: Fixed paths
tuutti Feb 13, 2024
8226ee0
UHF-9546: Removed unnecessary settings
tuutti Feb 13, 2024
60a3346
UHF-9497: Removed custom icons for hdbt subtheme as all usable icons …
khalima Feb 20, 2024
bdbf783
UHF-9446: Remove district listing configuration
teroelonen Feb 26, 2024
bef69cc
UHF-9446: Remove unneccessary code related to district listing
teroelonen Feb 26, 2024
c41f38a
UHF-9446: Remove district listing test content and some references to…
teroelonen Feb 28, 2024
69d8ed8
UHF-9446: Merge branch 'dev' of github.com:City-of-Helsinki/drupal-he…
teroelonen Feb 28, 2024
469149c
UHF-9718: Test automatic update
tuutti Feb 28, 2024
d470093
UHF-9718: Fixed base branch
tuutti Feb 28, 2024
5b3b5a6
UHF-9718: DEbug message
tuutti Feb 28, 2024
066b76d
UHF-9718: Fixed redirect
tuutti Feb 28, 2024
a9d7b4a
UHF-9718: Markdown table
tuutti Feb 29, 2024
ebb5247
UHF-9718: Shell escape
tuutti Feb 29, 2024
47fb6bc
UHF-9718: Empty line
tuutti Feb 29, 2024
5e9dde2
UHF-9718: Revert composer changes
tuutti Feb 29, 2024
b5f56ca
UHF-9718: Always use dev as base branch
tuutti Feb 29, 2024
9063dbc
UHF-9718: Find correct PR id
tuutti Mar 1, 2024
e1cdcd6
UHF-9718: Testing comment
tuutti Mar 1, 2024
9aa569f
UHF-9718: Fix variable
tuutti Mar 1, 2024
61fa092
UHF-9718: Fixed variable name
tuutti Mar 1, 2024
0db9cdb
UHF-9718: More branch name fixes
tuutti Mar 1, 2024
efbb58d
UHF-9718: Revert back to newest proxy module
tuutti Mar 1, 2024
79f8e39
UHF-9718: Use step summary
tuutti Mar 1, 2024
ba3a59d
UHF-9718: Fixes
tuutti Mar 1, 2024
8cb9795
UHF-9718: Fixes
tuutti Mar 1, 2024
58a1ba4
UHF-9718: Check module versions before pull request
tuutti Mar 1, 2024
1c48658
UHF-9718: Require old version of api base module to test automatic up…
juho-lehmonen Mar 1, 2024
7d0d94d
UHF-9718: Remove module downgrading to test notifications.
juho-lehmonen Mar 1, 2024
c821c17
Merge pull request #806 from City-of-Helsinki/UHF-9446_remove_configu…
teroelonen Mar 1, 2024
2b4fb9d
Merge pull request #812 from City-of-Helsinki/UHF-9718
tuutti Mar 4, 2024
f14799b
Merge pull request #798 from City-of-Helsinki/UHF-9546
tuutti Mar 5, 2024
bcd1e05
UHF-9580: Add hearing paragraph to page content type upper content ar…
teroelonen Mar 5, 2024
f5066ea
UHF-9238: Remove smartti chat bot configuration that is no longer used
teroelonen Mar 5, 2024
6782394
Merge pull request #819 from City-of-Helsinki/UHF-9238
teroelonen Mar 6, 2024
e3b9261
Update configuration
hel-platta-automation Mar 6, 2024
fc2a51e
Merge pull request #813 from City-of-Helsinki/update-configuration
teroelonen Mar 6, 2024
81f6dad
UHF-9580: Merge branch 'dev' of github.com:City-of-Helsinki/drupal-he…
teroelonen Mar 6, 2024
8a3278c
Merge pull request #818 from City-of-Helsinki/UHF-9580
teroelonen Mar 6, 2024
105841b
Update configuration
hel-platta-automation Mar 6, 2024
d94f4cc
Merge pull request #803 from City-of-Helsinki/UHF-9497
khalima Mar 7, 2024
e252ef6
Merge pull request #820 from City-of-Helsinki/update-configuration
khalima Mar 7, 2024
5104d7e
Update configuration
hel-platta-automation Mar 11, 2024
1ea4a3e
Merge pull request #821 from City-of-Helsinki/update-configuration
teroelonen Mar 11, 2024
8f32817
Update configuration
hel-platta-automation Mar 11, 2024
e45d075
Merge pull request #822 from City-of-Helsinki/update-configuration
teroelonen Mar 11, 2024
63eeed0
Update configuration
hel-platta-automation Mar 11, 2024
cddce75
Merge pull request #823 from City-of-Helsinki/update-configuration
teroelonen Mar 11, 2024
7fec7da
Update configuration
hel-platta-automation Mar 11, 2024
46878a0
Merge pull request #824 from City-of-Helsinki/update-configuration
teroelonen Mar 12, 2024
d9f6a41
Update configuration
hel-platta-automation Mar 12, 2024
dae8ba8
Merge pull request #825 from City-of-Helsinki/update-configuration
teroelonen Mar 13, 2024
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
42 changes: 34 additions & 8 deletions .github/workflows/update-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
repository_dispatch:
types: [config_change]
name: Update config
env:
GH_TOKEN: ${{ github.token }}
jobs:
update-config:
runs-on: ubuntu-latest
Expand All @@ -21,10 +23,7 @@ jobs:
- 3306:3306

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 1

- uses: actions/checkout@v4
- name: Download latest dump
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -41,16 +40,43 @@ jobs:
# Update platform
drush helfi:tools:update-platform

- name: Check module versions
id: module-status
run: |
MODE="delete"
drush helfi:tools:check-composer-versions $GITHUB_WORKSPACE/composer.lock --format=markdown_table >> $GITHUB_STEP_SUMMARY && EXIT_CODE=$? || EXIT_CODE=$?
if [ "$EXIT_CODE" -eq 3 ]; then
MODE="upsert"
echo " " >> $GITHUB_STEP_SUMMARY
echo ":warning: Failed to install the latest version of the packages listed above" >> $GITHUB_STEP_SUMMARY
echo " " >> $GITHUB_STEP_SUMMARY
echo "Please run \`composer why-not drupal/package_name package_version\` to see why." >> $GITHUB_STEP_SUMMARY
fi
echo "MODE=$MODE" >> $GITHUB_OUTPUT
cat $GITHUB_STEP_SUMMARY > /tmp/pr-message.txt

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
committer: GitHub <[email protected]>
author: actions-bot <[email protected]>
commit-message: Update configuration
title: Automatic update
labels: auto-update
body: |
- Updated active configuration.
- Updated platform

branch: update-configuration

- name: Attempt to find PR
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
id: find-pr
run: echo "number=$(gh pr list --base ${BRANCH_NAME} --head update-configuration --json number --jq '.[].number')" >> $GITHUB_OUTPUT

- name: Comment PR
uses: thollander/actions-comment-pull-request@v2
if: ${{ steps.find-pr.outputs.number != '' }}
with:
comment_tag: status
mode: ${{ steps.module-status.outputs.MODE }}
filePath: /tmp/pr-message.txt
pr_number: ${{ steps.find-pr.outputs.number }}
281 changes: 147 additions & 134 deletions composer.lock

Large diffs are not rendered by default.

33 changes: 0 additions & 33 deletions conf/cmi/block.block.smarttichatbot.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- paragraphs.paragraphs_type.content_cards
- paragraphs.paragraphs_type.content_liftup
- paragraphs.paragraphs_type.district_and_project_search
- paragraphs.paragraphs_type.district_listing
- paragraphs.paragraphs_type.image
- paragraphs.paragraphs_type.liftup_with_image
- paragraphs.paragraphs_type.list_of_links
Expand Down Expand Up @@ -43,7 +42,6 @@ settings:
handler_settings:
target_bundles:
district_and_project_search: district_and_project_search
district_listing: district_listing
list_of_plans: list_of_plans
accordion: accordion
banner: banner
Expand Down Expand Up @@ -82,9 +80,6 @@ settings:
district_and_project_search:
weight: 1
enabled: true
district_listing:
weight: 3
enabled: true
image:
weight: 0
enabled: true
Expand Down
10 changes: 7 additions & 3 deletions conf/cmi/core.entity_form_display.node.page.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- publication_date
- scheduler
_core:
default_config_hash: _RX52hwdyz48o4MBqyRPUVkop-Unt1rcPuPanpQ7ksk
default_config_hash: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0
id: node.page.default
targetEntityType: node
bundle: page
Expand Down Expand Up @@ -79,10 +79,12 @@ content:
duplicate: '0'
third_party_settings: { }
field_lead_in:
type: string_textarea
type: textarea_character_counter
weight: 13
region: content
settings:
counter_step: 160
counter_total: 200
rows: 3
placeholder: ''
third_party_settings: { }
Expand Down Expand Up @@ -203,10 +205,12 @@ content:
display_label: true
third_party_settings: { }
title:
type: string_textfield
type: textfield_character_counter
weight: 1
region: content
settings:
counter_step: 0
counter_total: 55
size: 60
placeholder: ''
third_party_settings: { }
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ dependencies:
- field.field.paragraph.event_list.field_event_list_title
- field.field.paragraph.event_list.field_event_location
- field.field.paragraph.event_list.field_event_time
- field.field.paragraph.event_list.field_filter_keywords
- field.field.paragraph.event_list.field_free_events
- field.field.paragraph.event_list.field_remote_events
- paragraphs.paragraphs_type.event_list
module:
- link
- text
_core:
default_config_hash: bGb0ZQ38-NxHtZ1rrdqclYHeStlwA5q3ucy5Wpnb0ng
default_config_hash: 26rzwNcMiiF5Bucl9iUliZYoL4vZcdmdNkYBAr9DYOU
id: paragraph.event_list.default
targetEntityType: paragraph
bundle: event_list
Expand Down Expand Up @@ -66,6 +67,16 @@ content:
settings:
display_label: true
third_party_settings: { }
field_filter_keywords:
type: entity_reference_autocomplete_tags
weight: 8
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
field_free_events:
type: boolean_checkbox
weight: 7
Expand Down
19 changes: 14 additions & 5 deletions conf/cmi/core.entity_form_display.paragraph.hero.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,29 @@ dependencies:
- field.field.paragraph.hero.field_hero_title
- paragraphs.paragraphs_type.hero
module:
- allowed_formats
- hdbt_admin_tools
- media_library
- text
_core:
default_config_hash: CvDiqRtujItZjhiR7KUf0a9dQrlgEcmuDDhJHmzUNOw
default_config_hash: 1GjBs_T3tKYlTF4jxU6lUtwC7YSCChaZ4Tmsrialewk
id: paragraph.hero.default
targetEntityType: paragraph
bundle: hero
mode: default
content:
field_hero_desc:
type: text_textarea
type: formatted_text_character_counter
weight: 3
region: content
settings:
counter_step: 160
counter_total: 200
rows: 5
placeholder: ''
third_party_settings: { }
third_party_settings:
allowed_formats:
hide_help: '0'
hide_guidelines: '0'
field_hero_design:
type: design_field_widget
weight: 0
Expand All @@ -47,6 +52,8 @@ content:
weight: 6
region: content
settings:
placeholder_url: ''
placeholder_title: ''
linkit_profile: helfi
linkit_auto_link_text: false
third_party_settings: { }
Expand All @@ -57,10 +64,12 @@ content:
settings: { }
third_party_settings: { }
field_hero_title:
type: string_textfield
type: textfield_character_counter
weight: 2
region: content
settings:
counter_step: 0
counter_total: 55
size: 60
placeholder: ''
third_party_settings: { }
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
uuid: d3bdb49e-461c-4a0f-a88c-c34eb54f7101
langcode: en
status: true
dependencies:
config:
- field.field.taxonomy_term.linked_events_keywords.field_keyword_id
- taxonomy.vocabulary.linked_events_keywords
module:
- hdbt_admin_tools
- path
- readonly_field_widget
_core:
default_config_hash: wrJ7qU6IE5H0AiZu6m8w7XCBXT-dqOntJPqFqR0iyU8
id: taxonomy_term.linked_events_keywords.default
targetEntityType: taxonomy_term
bundle: linked_events_keywords
mode: default
content:
description:
type: formatted_text_character_counter
weight: 0
region: content
settings:
counter_step: 160
counter_total: 200
rows: 5
placeholder: ''
third_party_settings: { }
field_keyword_id:
type: readonly_field_widget
weight: 101
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
langcode:
type: language_select
weight: 2
region: content
settings:
include_locked: true
third_party_settings: { }
name:
type: string_textfield
weight: -5
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
path:
type: path
weight: 30
region: content
settings: { }
third_party_settings: { }
status:
type: boolean_checkbox
weight: 100
region: content
settings:
display_label: true
third_party_settings: { }
translation:
weight: 10
region: content
settings: { }
third_party_settings: { }
hidden: { }
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.media.image.hero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
module:
- responsive_image
_core:
default_config_hash: UX2CrJYBdnGTpSaqiYid65d46ihnZEmWEBJbdXJZQ7g
default_config_hash: 1TRAhLvz-37rbjca1TJiVCP65Gy_X5ppn2iiiTRvl-g
id: media.image.hero
targetEntityType: media
bundle: image
Expand Down
Loading
Loading