From 6dd84a17630dca737a0cfa928c52928714df6a56 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 3 Oct 2023 06:54:31 +0000 Subject: [PATCH] Update configuration --- composer.lock | 100 +++++++++--------- ....menu_link_content.branding-navigation.yml | 4 - ...ettings.default.menu_link_content.main.yml | 4 - conf/cmi/simple_sitemap.settings.yml | 1 - docker/openshift/crons/purge-queue.sh | 11 +- 5 files changed, 59 insertions(+), 61 deletions(-) delete mode 100644 conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.branding-navigation.yml delete mode 100644 conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml diff --git a/composer.lock b/composer.lock index c8078d3e..e13a456d 100644 --- a/composer.lock +++ b/composer.lock @@ -1371,16 +1371,16 @@ }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { @@ -1412,9 +1412,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/lexer", @@ -1647,17 +1647,17 @@ }, { "name": "drupal/admin_toolbar", - "version": "3.4.1", + "version": "3.4.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/admin_toolbar.git", - "reference": "3.4.1" + "reference": "3.4.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.1.zip", - "reference": "3.4.1", - "shasum": "bcb15ab40016becdb3ac8f21d7d1a721f48f3577" + "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.2.zip", + "reference": "3.4.2", + "shasum": "f5a008e5c73f5a11c6c8067c0ea6ebb76aa33854" }, "require": { "drupal/core": "^9.2 || ^10" @@ -1668,8 +1668,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.4.1", - "datestamp": "1684944156", + "version": "3.4.2", + "datestamp": "1696006195", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3982,16 +3982,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.12", + "version": "5.6.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1" + "reference": "00c6881d074393257e9c400268dc44e3d2e916b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c24eecd637d0373f9da2bcc01336feee376fcaf1", - "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/00c6881d074393257e9c400268dc44e3d2e916b0", + "reference": "00c6881d074393257e9c400268dc44e3d2e916b0", "shasum": "" }, "require": { @@ -4009,10 +4009,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.12", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.13", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-09-26T09:47:13+00:00" + "time": "2023-09-28T05:10:25+00:00" }, { "name": "drupal/hdbt_admin", @@ -4101,16 +4101,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.5", + "version": "2.5.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35" + "reference": "d304750c887b039f527299007331d1ea8935fb2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7ffd5b029f1d85590dc8966007f3936f14cb3c35", - "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/d304750c887b039f527299007331d1ea8935fb2d", + "reference": "d304750c887b039f527299007331d1ea8935fb2d", "shasum": "" }, "require": { @@ -4136,10 +4136,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-09-18T06:55:18+00:00" + "time": "2023-09-28T05:34:10+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4242,16 +4242,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.17", + "version": "3.4.18", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "46244701cdef62af87c7e376b4e43391ee6c870c" + "reference": "f560477ce4d8b8e7cc56939c9dede6e24f106dc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/46244701cdef62af87c7e376b4e43391ee6c870c", - "reference": "46244701cdef62af87c7e376b4e43391ee6c870c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f560477ce4d8b8e7cc56939c9dede6e24f106dc8", + "reference": "f560477ce4d8b8e7cc56939c9dede6e24f106dc8", "shasum": "" }, "require": { @@ -4354,10 +4354,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.17", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.18", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-09-27T08:15:04+00:00" + "time": "2023-10-02T10:58:02+00:00" }, { "name": "drupal/helfi_proxy", @@ -5006,17 +5006,17 @@ }, { "name": "drupal/linkit", - "version": "6.0.0", + "version": "6.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.0.0" + "reference": "6.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0.zip", - "reference": "6.0.0", - "shasum": "3c4143eb797abee04e5af47eb1885a65e6321b51" + "url": "https://ftp.drupal.org/files/projects/linkit-6.0.1.zip", + "reference": "6.0.1", + "shasum": "c990a0fab63cb65d46dcf312aa0363f65e31ee68" }, "require": { "drupal/core": "^9.4 || ^10.0.0" @@ -5031,8 +5031,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.0", - "datestamp": "1688748025", + "version": "6.0.1", + "datestamp": "1696099905", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -13565,16 +13565,16 @@ }, { "name": "symfony/string", - "version": "v6.3.2", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "53d1a83225002635bca3482fcbf963001313fb68" + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68", - "reference": "53d1a83225002635bca3482fcbf963001313fb68", + "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", "shasum": "" }, "require": { @@ -13631,7 +13631,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.2" + "source": "https://github.com/symfony/string/tree/v6.3.5" }, "funding": [ { @@ -13647,7 +13647,7 @@ "type": "tidelift" } ], - "time": "2023-07-05T08:41:27+00:00" + "time": "2023-09-18T10:38:32+00:00" }, { "name": "symfony/translation", @@ -13924,16 +13924,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.28", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73" + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65", + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65", "shasum": "" }, "require": { @@ -13993,7 +13993,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.28" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.29" }, "funding": [ { @@ -14009,7 +14009,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T13:38:36+00:00" + "time": "2023-09-12T10:09:58+00:00" }, { "name": "symfony/yaml", diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.branding-navigation.yml b/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.branding-navigation.yml deleted file mode 100644 index 6bda8943..00000000 --- a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.branding-navigation.yml +++ /dev/null @@ -1,4 +0,0 @@ -index: false -priority: '0.5' -changefreq: '' -include_images: false diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml b/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml deleted file mode 100644 index 8e55877d..00000000 --- a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml +++ /dev/null @@ -1,4 +0,0 @@ -index: true -priority: '0.5' -changefreq: '' -include_images: false diff --git a/conf/cmi/simple_sitemap.settings.yml b/conf/cmi/simple_sitemap.settings.yml index 725ad033..dd5f0569 100644 --- a/conf/cmi/simple_sitemap.settings.yml +++ b/conf/cmi/simple_sitemap.settings.yml @@ -15,6 +15,5 @@ disable_language_hreflang: false excluded_languages: { } enabled_entity_types: - node - - menu_link_content - tpr_service - tpr_unit diff --git a/docker/openshift/crons/purge-queue.sh b/docker/openshift/crons/purge-queue.sh index d74ef3c4..2690144e 100644 --- a/docker/openshift/crons/purge-queue.sh +++ b/docker/openshift/crons/purge-queue.sh @@ -12,8 +12,15 @@ function has_items { while true do if has_items; then - drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}' + RESULT=$(drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}') + # RESULT is an array of json objects. Process each result and + # only output the failed items. + echo $RESULT | jq -c '.[]' | while read LINE; do + if [ $(echo "$LINE" | jq .failed) -gt "0" ]; then + echo $LINE + fi + done fi - # Sleep for 60 seconds. + sleep 60 done