From 7cb33a83ff42d1876c6ef34e6a33c65711646019 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 15 Nov 2023 13:20:08 +0000 Subject: [PATCH] Update configuration --- composer.lock | 115 ++++++++++++++-------------- conf/cmi/config_ignore.settings.yml | 11 +-- conf/cmi/core.extension.yml | 1 - tools/commit-msg | 3 +- 4 files changed, 67 insertions(+), 63 deletions(-) diff --git a/composer.lock b/composer.lock index 1b3b8b25..c903c758 100644 --- a/composer.lock +++ b/composer.lock @@ -1858,27 +1858,30 @@ }, { "name": "drupal/config_ignore", - "version": "2.4.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_ignore.git", - "reference": "8.x-2.4" + "reference": "8.x-3.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-2.4.zip", - "reference": "8.x-2.4", - "shasum": "e0e45dde2d6927c5d26de59f352792fb6cf26554" + "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-3.1.zip", + "reference": "8.x-3.1", + "shasum": "5e60f312e02735060d5e5b1724330bb243face4c" }, "require": { - "drupal/config_filter": "^1 || ^2", - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^8.8 || ^9 || ^10" + }, + "require-dev": { + "drupal/config_filter": "^1.8||^2.2", + "drush/drush": "^10 || ^11 || ^12" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.4", - "datestamp": "1676045435", + "version": "8.x-3.1", + "datestamp": "1699302168", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1887,7 +1890,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -1906,12 +1909,11 @@ "homepage": "https://www.drupal.org/user/413139" } ], - "description": "Ignore certain configuration during import.", + "description": "Ignore certain configuration during import and export.", "homepage": "http://drupal.org/project/config_ignore", "support": { "source": "https://git.drupalcode.org/project/config_ignore", - "issues": "https://drupal.org/project/config_ignore", - "irc": "irc://irc.freenode.org/drupal-contribute" + "issues": "http://drupal.org/project/config_ignore" } }, { @@ -3751,16 +3753,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.25", + "version": "5.8.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "09c80a3399d9319f1dfb837e190113f0a6c6effb" + "reference": "a3d97cae804200d20469ce02870eecedc8bfc251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/09c80a3399d9319f1dfb837e190113f0a6c6effb", - "reference": "09c80a3399d9319f1dfb837e190113f0a6c6effb", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/a3d97cae804200d20469ce02870eecedc8bfc251", + "reference": "a3d97cae804200d20469ce02870eecedc8bfc251", "shasum": "" }, "require": { @@ -3778,10 +3780,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.25", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.8.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-10-30T12:30:23+00:00" + "time": "2023-11-13T11:20:37+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3872,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.11", + "version": "2.5.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "cd300f71fcf464111636eec7c1da7f4bc855f772" + "reference": "0e993700f6611def239ec225a3ada1d123b30623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/cd300f71fcf464111636eec7c1da7f4bc855f772", - "reference": "cd300f71fcf464111636eec7c1da7f4bc855f772", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/0e993700f6611def239ec225a3ada1d123b30623", + "reference": "0e993700f6611def239ec225a3ada1d123b30623", "shasum": "" }, "require": { @@ -3907,10 +3909,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.11", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.12", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-11-06T08:22:25+00:00" + "time": "2023-11-15T13:15:43+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4039,22 +4041,23 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.37", + "version": "3.4.38", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "97707c1a7b6b92e1855594c15312e7dbb9a6a9fb" + "reference": "b57eb720797008f2372243031613fec6578ca567" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/97707c1a7b6b92e1855594c15312e7dbb9a6a9fb", - "reference": "97707c1a7b6b92e1855594c15312e7dbb9a6a9fb", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b57eb720797008f2372243031613fec6578ca567", + "reference": "b57eb720797008f2372243031613fec6578ca567", "shasum": "" }, "require": { "drupal/admin_toolbar": "^3.0", "drupal/allowed_formats": "^2.0", - "drupal/config_ignore": "^2.3", + "drupal/config_filter": "^2.6", + "drupal/config_ignore": "^3.0", "drupal/config_rewrite": "^1.4", "drupal/content_lock": "^2.2", "drupal/core": "^9.5", @@ -4153,10 +4156,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.37", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.38", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-11-07T05:48:17+00:00" + "time": "2023-11-15T10:37:51+00:00" }, { "name": "drupal/helfi_proxy", @@ -7259,16 +7262,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d" + "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", - "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/0795b7db12838ffb7bc564e0a02cf53fb1463ec0", + "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0", "shasum": "" }, "require": { @@ -7315,9 +7318,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.0.2" + "source": "https://github.com/FileEye/MimeMap/tree/2.0.3" }, - "time": "2023-08-29T16:20:26+00:00" + "time": "2023-11-11T14:14:23+00:00" }, { "name": "fileeye/pel", @@ -11364,16 +11367,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.13", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/761c8b8387cfe5f8026594a75fdf0a4e83ba6974", + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974", "shasum": "" }, "require": { @@ -11423,7 +11426,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.10.0" }, "funding": [ { @@ -11439,7 +11442,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/filesystem", @@ -11805,16 +11808,16 @@ }, { "name": "symfony/http-kernel", - "version": "v4.4.50", + "version": "v4.4.51", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef" + "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa6df6c045f034aa13ac752fc234bb300b9488ef", - "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ad8ab192cb619ff7285c95d28c69b36d718416c7", + "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7", "shasum": "" }, "require": { @@ -11889,7 +11892,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.50" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.51" }, "funding": [ { @@ -11905,7 +11908,7 @@ "type": "tidelift" } ], - "time": "2023-02-01T08:01:31+00:00" + "time": "2023-11-10T13:31:29+00:00" }, { "name": "symfony/mime", @@ -13213,16 +13216,16 @@ }, { "name": "symfony/string", - "version": "v6.3.5", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" + "reference": "13880a87790c76ef994c91e87efb96134522577a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", + "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", + "reference": "13880a87790c76ef994c91e87efb96134522577a", "shasum": "" }, "require": { @@ -13279,7 +13282,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" + "source": "https://github.com/symfony/string/tree/v6.3.8" }, "funding": [ { @@ -13295,7 +13298,7 @@ "type": "tidelift" } ], - "time": "2023-09-18T10:38:32+00:00" + "time": "2023-11-09T08:28:21+00:00" }, { "name": "symfony/translation", diff --git a/conf/cmi/config_ignore.settings.yml b/conf/cmi/config_ignore.settings.yml index 7683f5d5..8777af95 100644 --- a/conf/cmi/config_ignore.settings.yml +++ b/conf/cmi/config_ignore.settings.yml @@ -1,12 +1,13 @@ _core: default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk +mode: simple ignored_config_entities: - - 'system.site:page.front' - - 'hdbt_admin_tools.site_settings:site_settings' - - 'hdbt_admin_tools.site_settings:footer_settings' - - 'easy_breadcrumb.settings:home_segment_title' - block.block.ibmchatapp + - block.block.ibmchatapp_neuvonta_en - block.block.ibmchatapp_neuvonta_fi - block.block.ibmchatapp_neuvonta_sv - - block.block.ibmchatapp_neuvonta_en - block.block.ibmchatapp_watson_talpa + - 'easy_breadcrumb.settings:home_segment_title' + - 'hdbt_admin_tools.site_settings:footer_settings' + - 'hdbt_admin_tools.site_settings:site_settings' + - 'system.site:page.front' diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 290ad283..d2c19f9f 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -11,7 +11,6 @@ module: breakpoint: 0 ckeditor: 0 config: 0 - config_filter: 0 config_ignore: 0 config_rewrite: 0 config_translation: 0 diff --git a/tools/commit-msg b/tools/commit-msg index 04a43086..9840c0bd 100755 --- a/tools/commit-msg +++ b/tools/commit-msg @@ -4,12 +4,13 @@ # feature/PROJECT-1234-test-test # PROJECT-1234-test-test # PROJECT-1234_test_test +# fixup! (for git rebase --autosquash) id=$(echo `git rev-parse --abbrev-ref HEAD` | sed -nE 's|([a-z]+/)?([A-Z]+-[0-9]+)(-.+)?(_.+)?|\2|p') COMMIT_MESSAGE=$(cat $1) # Only prepare commit message if pattern matched and Jira ID was found and # message doesn't contain Jira ID already. -if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]]; then +if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]] && [[ $COMMIT_MESSAGE != "fixup!"* ]]; then # $1 is the name of the file containing the commit message # Prepend "ABCD-123: " sed -i.bak -E "1s/^/${id}: /" $1