From d21b6636a21fe82cfbe2ca99070d519bbafa78c0 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Mon, 13 Nov 2023 14:03:34 +0000 Subject: [PATCH] Update configuration --- composer.lock | 60 ++++++++++++++++++++++++------------------------ tools/commit-msg | 3 ++- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 485f01b3..927b39cc 100644 --- a/composer.lock +++ b/composer.lock @@ -3816,16 +3816,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": { @@ -3843,10 +3843,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", @@ -7386,16 +7386,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": { @@ -7442,9 +7442,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", @@ -11491,16 +11491,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": { @@ -11550,7 +11550,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": [ { @@ -11566,7 +11566,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/filesystem", @@ -11932,16 +11932,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": { @@ -12016,7 +12016,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": [ { @@ -12032,7 +12032,7 @@ "type": "tidelift" } ], - "time": "2023-02-01T08:01:31+00:00" + "time": "2023-11-10T13:31:29+00:00" }, { "name": "symfony/mime", @@ -13340,16 +13340,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": { @@ -13406,7 +13406,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" + "source": "https://github.com/symfony/string/tree/v6.3.8" }, "funding": [ { @@ -13422,7 +13422,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/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