diff --git a/composer.lock b/composer.lock index 689dc8b1..d042d2e3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "89e82195f4e181cc29f34f04a3ab1647", + "content-hash": "65c42d955ab0831afc4736f1685f9947", "packages": [ { "name": "asm89/stack-cors", @@ -2025,16 +2025,16 @@ }, { "name": "drupal/core", - "version": "10.1.6", + "version": "10.1.7", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "33695caf467e3e1e8c75d42215df57bee31be9ec" + "reference": "54415049a721ede65318e3980b402af59bc35913" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/33695caf467e3e1e8c75d42215df57bee31be9ec", - "reference": "33695caf467e3e1e8c75d42215df57bee31be9ec", + "url": "https://api.github.com/repos/drupal/core/zipball/54415049a721ede65318e3980b402af59bc35913", + "reference": "54415049a721ede65318e3980b402af59bc35913", "shasum": "" }, "require": { @@ -2179,9 +2179,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.1.6" + "source": "https://github.com/drupal/core/tree/10.1.7" }, - "time": "2023-11-01T11:59:20+00:00" + "time": "2023-12-06T09:22:56+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -2633,17 +2633,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.5", + "version": "2.1.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.5" + "reference": "2.1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.5.zip", - "reference": "2.1.5", - "shasum": "0886f7642685854d0835afdc24b8821d937b7c69" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.6.zip", + "reference": "2.1.6", + "shasum": "40b2db74784e8e51bd73d5efec049c612ced4e19" }, "require": { "drupal/core": "^9 || ^10" @@ -2651,8 +2651,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.5", - "datestamp": "1701191022", + "version": "2.1.6", + "datestamp": "1701962534", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2834,35 +2834,39 @@ }, { "name": "drupal/entity_browser", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_browser.git", - "reference": "8.x-2.9" + "reference": "8.x-2.10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.9.zip", - "reference": "8.x-2.9", - "shasum": "251afad80cde9fa547501a8d9de5d94b9f5bacff" + "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.10.zip", + "reference": "8.x-2.10", + "shasum": "d52548ea66dc56108c2e211aeaff6e1cc0522e85" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.5 || ^10" + }, + "conflict": { + "drupal/media_entity": "1.*" }, "require-dev": { - "drupal/embed": "~1.0", - "drupal/entity_embed": "1.x-dev", - "drupal/entity_reference_revisions": "1.x-dev", - "drupal/entityqueue": "1.x-dev", - "drupal/inline_entity_form": "1.x-dev", - "drupal/paragraphs": "1.x-dev", - "drupal/token": "1.x-dev" + "drupal/ckeditor": "^1.0", + "drupal/embed": "^1.0", + "drupal/entity_embed": "^1.0", + "drupal/entity_reference_revisions": "^1.0", + "drupal/entityqueue": "^1.0", + "drupal/inline_entity_form": "^1.0@rc", + "drupal/paragraphs": "^1.0", + "drupal/token": "^1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.9", - "datestamp": "1674070933", + "version": "8.x-2.10", + "datestamp": "1702325310", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2915,7 +2919,7 @@ } ], "description": "Entity browsing and selecting component.", - "homepage": "http://drupal.org/project/entity_browser", + "homepage": "https://drupal.org/project/entity_browser", "support": { "source": "https://git.drupalcode.org/project/entity_browser", "issues": "https://www.drupal.org/project/issues/entity_browser", @@ -3330,20 +3334,20 @@ }, { "name": "drupal/file_mdm", - "version": "2.6.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/file_mdm.git", - "reference": "8.x-2.6" + "reference": "3.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/file_mdm-8.x-2.6.zip", - "reference": "8.x-2.6", - "shasum": "56c7c06107ce6e249b6d644136e6807573efb0e3" + "url": "https://ftp.drupal.org/files/projects/file_mdm-3.0.0.zip", + "reference": "3.0.0", + "shasum": "d6ea077882777619c25b217301dc3d1c10218502" }, "require": { - "drupal/core": "^9.3 | ^10", + "drupal/core": "^10.1", "fileeye/pel": "^0.9.20", "phenx/php-font-lib": "^0.5.4" }, @@ -3354,8 +3358,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.6", - "datestamp": "1688489716", + "version": "3.0.0", + "datestamp": "1691421181", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3573,17 +3577,17 @@ }, { "name": "drupal/gin", - "version": "3.0.0-rc7", + "version": "3.0.0-rc8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin.git", - "reference": "8.x-3.0-rc7" + "reference": "8.x-3.0-rc8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc7.zip", - "reference": "8.x-3.0-rc7", - "shasum": "9f91862fc82ef8b0adbf34b26caa3c42d4f1f6b2" + "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc8.zip", + "reference": "8.x-3.0-rc8", + "shasum": "656520834445c7b34986f2340b5261637cfee3ca" }, "require": { "drupal/core": "^9 || ^10", @@ -3592,8 +3596,8 @@ "type": "drupal-theme", "extra": { "drupal": { - "version": "8.x-3.0-rc7", - "datestamp": "1697193234", + "version": "8.x-3.0-rc8", + "datestamp": "1702729136", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3635,17 +3639,17 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-rc4", + "version": "1.0.0-rc5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-rc4" + "reference": "8.x-1.0-rc5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc4.zip", - "reference": "8.x-1.0-rc4", - "shasum": "4f5fa958362b02804564302b0dfceb39e1b38119" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc5.zip", + "reference": "8.x-1.0-rc5", + "shasum": "523b565244440a16fa447065a98841770992bd2e" }, "require": { "drupal/core": "^9 || ^10" @@ -3653,8 +3657,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc4", - "datestamp": "1697192878", + "version": "8.x-1.0-rc5", + "datestamp": "1702727588", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3747,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "6.1.6", + "version": "6.2.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "1a0cc85d2c2e1de14e13530709693bf9c9100273" + "reference": "8cfea20e3b7203f4ec48a1eaa8a708c2d679932a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1a0cc85d2c2e1de14e13530709693bf9c9100273", - "reference": "1a0cc85d2c2e1de14e13530709693bf9c9100273", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8cfea20e3b7203f4ec48a1eaa8a708c2d679932a", + "reference": "8cfea20e3b7203f4ec48a1eaa8a708c2d679932a", "shasum": "" }, "require": { @@ -3774,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.1.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.2.2", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-12-05T12:50:03+00:00" + "time": "2023-12-19T08:46:35+00:00" }, { "name": "drupal/hdbt_admin", @@ -4040,16 +4044,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.1.4", + "version": "4.2.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "9adcf9998ab020196f6803538d8192d245560866" + "reference": "c19b04e136d5a11c7e8a05b1b51140871e4ee936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9adcf9998ab020196f6803538d8192d245560866", - "reference": "9adcf9998ab020196f6803538d8192d245560866", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c19b04e136d5a11c7e8a05b1b51140871e4ee936", + "reference": "c19b04e136d5a11c7e8a05b1b51140871e4ee936", "shasum": "" }, "require": { @@ -4110,9 +4114,10 @@ "php": "^8.1" }, "conflict": { - "drupal/core": "<10.1", + "drupal/core": "<10.1 || >=10.2", "drupal/ctools": "<3.11 || ^4.0.1", "drupal/helfi_media_map": "*", + "drupal/simple_sitemap": ">4.1.7", "drush/drush": "<12" }, "type": "drupal-module", @@ -4128,7 +4133,8 @@ "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/b628bc051d82a1883768364050aa833824bd48c8/patches/drupal_core_strip_debug_mode_whitespaces_10.1.x.patch", "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch", "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch", - "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/a42c905a162c8510348b17cdf60000a0a7f82037/patches/drupal-2313309-render-admin-toolbar-with-admin-language.patch" + "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/a42c905a162c8510348b17cdf60000a0a7f82037/patches/drupal-2313309-render-admin-toolbar-with-admin-language.patch", + "[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4161,10 +4167,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.1.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.2.4", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-12-01T11:23:19+00:00" + "time": "2023-12-19T11:41:04+00:00" }, { "name": "drupal/helfi_proxy", @@ -4220,16 +4226,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.1", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "1c35432dba2972ff608b038849cd2e83e98ebe83" + "reference": "cf8fd5d9b66d629845c44c4d8a901e81e9caef11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/1c35432dba2972ff608b038849cd2e83e98ebe83", - "reference": "1c35432dba2972ff608b038849cd2e83e98ebe83", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/cf8fd5d9b66d629845c44c4d8a901e81e9caef11", + "reference": "cf8fd5d9b66d629845c44c4d8a901e81e9caef11", "shasum": "" }, "require": { @@ -4255,10 +4261,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-11-21T11:43:29+00:00" + "time": "2023-12-19T10:01:23+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -4408,28 +4414,28 @@ }, { "name": "drupal/imagemagick", - "version": "3.4.0", + "version": "3.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/imagemagick.git", - "reference": "8.x-3.4" + "reference": "8.x-3.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.4.zip", - "reference": "8.x-3.4", - "shasum": "9f07b7db4bba2cb0e4ff004629f8f78242bb7226" + "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.6.zip", + "reference": "8.x-3.6", + "shasum": "b4efc5ff6ab5469475f0ef7242eba0c7eda1c75c" }, "require": { - "drupal/core": "^9.3 || ^10", - "drupal/file_mdm": "^2.5", - "drupal/sophron": "^1.2 || ^2" + "drupal/core": "^10.1", + "drupal/file_mdm": "^3", + "drupal/sophron": "^2.0.2" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.4", - "datestamp": "1663947784", + "version": "8.x-3.6", + "datestamp": "1702632545", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5120,20 +5126,20 @@ }, { "name": "drupal/paragraphs_asymmetric_translation_widgets", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/paragraphs_asymmetric_translation_widgets.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs_asymmetric_translation_widgets-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "019b4a318ba9354e3839036638d249e07322eea5" + "url": "https://ftp.drupal.org/files/projects/paragraphs_asymmetric_translation_widgets-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "adeec4a2cd6f06e01dd5dcac27c39fad986ca80f" }, "require": { - "drupal/core": "^8 || ^9 || ^10", + "drupal/core": "^9.3 || ^10", "drupal/paragraphs": "~1.15" }, "require-dev": { @@ -5145,8 +5151,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1681378872", + "version": "8.x-1.3", + "datestamp": "1702031259", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8917,16 +8923,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -8967,9 +8973,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "nodespark/des-connector", @@ -16143,16 +16149,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.4", + "version": "1.24.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496" + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6bd0c26f3786cd9b7c359675cb789e35a8e07496", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc", + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc", "shasum": "" }, "require": { @@ -16184,9 +16190,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.4" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5" }, - "time": "2023-11-26T18:29:22+00:00" + "time": "2023-12-16T09:33:33+00:00" }, { "name": "phpstan/phpstan", diff --git a/tools/make/ansible.mk b/tools/make/ansible.mk new file mode 100644 index 00000000..5244b756 --- /dev/null +++ b/tools/make/ansible.mk @@ -0,0 +1,38 @@ +ANSIBLE_INVENTORY_PATH ?= ansible/inventory +ANSIBLE_ROLES_PATH ?= ansible/roles +ANSIBLE_CHECK_ROLE ?= geerlingguy.docker +ANSIBLE_PLAYBOOK ?= ansible-playbook +ANSIBLE_PROVISION ?= ansible/provision.yml +ANSIBLE_REQUIREMENTS ?= ansible/requirements.yml + +PHONY += provision +provision: INVENTORY ?= production +provision: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make provisioning + $(call step,Ansible: Make dry run on provisioning...\n) + @$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) + +PHONY += provision-% +provision-%: INVENTORY ?= production +provision-%: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make provisioning by tag + $(call step,Ansible: Make provisioning by tag "$*"...\n) + @$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) --tags="$*" + +PHONY += provision-dry-run +provision-dry-run: INVENTORY ?= production +provision-dry-run: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make dry run on provisioning + $(call step,Ansible: Make dry run on provisioning...\n) + @$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) --check + +PHONY += ansible-install-roles +ansible-install-roles: ## Install Ansible roles + $(call step,Ansible: Install Ansible roles...\n) + @ansible-galaxy install -r $(ANSIBLE_REQUIREMENTS) -p $(ANSIBLE_ROLES_PATH) + +PHONY += ansible-update-roles +ansible-update-roles: ## Update Ansible roles + $(call step,Ansible: Update Ansible roles...\n) + @ansible-galaxy remove --roles-path=$(ANSIBLE_ROLES_PATH) $(shell find $(ANSIBLE_ROLES_PATH) -mindepth 1 -maxdepth 1 -type d -exec basename {} \;) || true + @ansible-galaxy install --force-with-deps --role-file=$(ANSIBLE_REQUIREMENTS) --roles-path=$(ANSIBLE_ROLES_PATH) + +$(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE): + @$(MAKE) ansible-install-roles diff --git a/tools/make/include.mk b/tools/make/include.mk index cf95f4d5..3f469ae6 100644 --- a/tools/make/include.mk +++ b/tools/make/include.mk @@ -21,6 +21,16 @@ ifeq ($(IS_SYMFONY),yes) include $(DRUIDFI_TOOLS_MAKE_DIR)symfony.mk endif +# +# Other tools +# + +HAS_ANSIBLE ?= $(shell test -d ansible && echo yes || echo no) + +ifeq ($(HAS_ANSIBLE),yes) +include $(DRUIDFI_TOOLS_MAKE_DIR)ansible.mk +endif + # # Hosting systems #