From 8f3784872fd20509ef0e1e27827d12439dd393b7 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Thu, 7 Sep 2023 11:24:05 +0200 Subject: [PATCH 01/23] Remove clark nikdel path --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 43158e5..e5aa54c 100644 --- a/composer.json +++ b/composer.json @@ -121,7 +121,6 @@ "installer-paths": { "wp-content/mu-plugins/{$name}": [ "type:wordpress-muplugin", - "clark-nikdel-powell/post-type-select-for-acf", "kirki-framework/kirki", "wpackagist-plugin/kirki" ], From 761d9e01aa7bf9c5074208984be6ac7125f5545f Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Thu, 7 Sep 2023 15:27:26 +0200 Subject: [PATCH 02/23] Install mu plugin to enable plugins_url for vendor directorys. Install sentry addon. --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e5aa54c..a5609ad 100644 --- a/composer.json +++ b/composer.json @@ -93,6 +93,7 @@ "helsingborg-stad/wpmu-acf-google-maps-key": "dev-main", "helsingborg-stad/wpmu-litespeed-common-settings": "^1.0.0", "helsingborg-stad/wpmu-network-admin-url": "dev-master", + "helsingborg-stad/wpmu-mu-plugins-url-everywhere": "~1.0.0", "humanmade/s3-uploads": "^3.0.4", "johnpbloch/wordpress": "6.3.1", "municipio-se/modularity-noticeboard": "1.0.0", @@ -113,7 +114,8 @@ "wpackagist-plugin/username-changer": "3.1.3", "wpackagist-plugin/varnish-http-purge": "^4.1.1", "wpackagist-plugin/wp-multi-network": "^2.5.2", - "wpackagist-plugin/wp-nested-pages": "3.1.4" + "wpackagist-plugin/wp-nested-pages": "3.1.4", + "wpackagist-plugin/wp-sentry-integration":"~6.24" }, "extra": { "path": "/", From 7646ec2867c2c2ebec7722aac9d81a0349c3677b Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Fri, 8 Sep 2023 08:56:43 +0200 Subject: [PATCH 03/23] Add performant translations --- composer.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a5609ad..768ac21 100644 --- a/composer.json +++ b/composer.json @@ -115,7 +115,8 @@ "wpackagist-plugin/varnish-http-purge": "^4.1.1", "wpackagist-plugin/wp-multi-network": "^2.5.2", "wpackagist-plugin/wp-nested-pages": "3.1.4", - "wpackagist-plugin/wp-sentry-integration":"~6.24" + "wpackagist-plugin/wp-sentry-integration":"~6.24", + "wpackagist-plugin/performant-translations":"~1.0.3" }, "extra": { "path": "/", @@ -124,7 +125,8 @@ "wp-content/mu-plugins/{$name}": [ "type:wordpress-muplugin", "kirki-framework/kirki", - "wpackagist-plugin/kirki" + "wpackagist-plugin/kirki", + "wpackagist-plugin/performant-translations" ], "wp-content/plugins/{$name}": [ "type:wordpress-plugin" From 6ef1dd2d749e22fbaa619ccc96003d0161ef4b6d Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Fri, 22 Sep 2023 11:30:41 +0200 Subject: [PATCH 04/23] Install acf-plugins as mu --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 768ac21..343f68c 100644 --- a/composer.json +++ b/composer.json @@ -124,6 +124,7 @@ "installer-paths": { "wp-content/mu-plugins/{$name}": [ "type:wordpress-muplugin", + "type:acf-plugin", "kirki-framework/kirki", "wpackagist-plugin/kirki", "wpackagist-plugin/performant-translations" From b6a458389336e62c06b0cecae9579951423f4e48 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Fri, 22 Sep 2023 13:46:18 +0200 Subject: [PATCH 05/23] Explicit in that acf-plugins should be treated as mu-plugins We may not have access to all acf plugins. This is also specific for this install and should not be considered as something normal. --- composer.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 343f68c..344fc26 100644 --- a/composer.json +++ b/composer.json @@ -127,7 +127,12 @@ "type:acf-plugin", "kirki-framework/kirki", "wpackagist-plugin/kirki", - "wpackagist-plugin/performant-translations" + "wpackagist-plugin/performant-translations", + "johannheyne/advanced-custom-fields-table-field", + "clark-nikdel-powell/post-type-select-for-acf", + "jeradin/acf-website-field", + "ooksanen/acf-focuspoint", + "jeradin/acf-dynamic-table-field" ], "wp-content/plugins/{$name}": [ "type:wordpress-plugin" From 8618ee3c9d23645fbcdde46cc375465febcd6a1e Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Fri, 22 Sep 2023 15:15:14 +0200 Subject: [PATCH 06/23] Remove specific placement, dump autoload in install. Managed to make all acf-plugins identify as mu-plugins. --- composer.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 344fc26..6f27e99 100644 --- a/composer.json +++ b/composer.json @@ -127,12 +127,7 @@ "type:acf-plugin", "kirki-framework/kirki", "wpackagist-plugin/kirki", - "wpackagist-plugin/performant-translations", - "johannheyne/advanced-custom-fields-table-field", - "clark-nikdel-powell/post-type-select-for-acf", - "jeradin/acf-website-field", - "ooksanen/acf-focuspoint", - "jeradin/acf-dynamic-table-field" + "wpackagist-plugin/performant-translations" ], "wp-content/plugins/{$name}": [ "type:wordpress-plugin" @@ -159,7 +154,8 @@ }, "scripts": { "post-install-cmd": [ - "mkdir -p wp-content/uploads/cache/blade-cache" + "mkdir -p wp-content/uploads/cache/blade-cache", + "composer dump-autoload -o" ], "post-update-cmd": [ "composer dump-autoload -o --working-dir ./wp-content/plugins/s3-uploads/", From c255daba2d8311f2e31b34e267b4f9a25bc9c2c3 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Mon, 25 Sep 2023 15:17:15 +0200 Subject: [PATCH 07/23] Remove clark nikdel package --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 6f27e99..53db97c 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,6 @@ ], "require": { "php": ">=7.4", - "clark-nikdel-powell/post-type-select-for-acf": "dev-master", "composer/installers": "~1.0", "helsingborg-stad/acf-ux-collapse": ">=1.0.0", "helsingborg-stad/active-directory-api-wp-integration": "^2.4.12", From 3b221488e821919298bf1226ac47f2976275614d Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Mon, 25 Sep 2023 15:20:08 +0200 Subject: [PATCH 08/23] Specify a stable release for Municipio Theme --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 53db97c..14e3609 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,7 @@ "helsingborg-stad/modularity-timeline": "dev-3.0/master", "helsingborg-stad/multi-network-urls": "^1.0.1", "helsingborg-stad/multisite-role-propagation": "^1.0", - "helsingborg-stad/municipio": "dev-3.0/develop", + "helsingborg-stad/municipio": "^3.0.1", "helsingborg-stad/redirection-extended": "^1.0", "helsingborg-stad/s3-uploads-custom-endpoint": "^1.0.0", "helsingborg-stad/search-notices": ">=1.0.0", From fd8ece63e800c8cefe1dead3616e7e0199bf671f Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Mon, 25 Sep 2023 17:15:27 +0200 Subject: [PATCH 09/23] Use Modularity 3.0.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 14e3609..99461e2 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,7 @@ "helsingborg-stad/lix-calculator": ">=1.0.1", "helsingborg-stad/media-usage": "^1.0", "helsingborg-stad/mod-my-pages": "dev-main", - "helsingborg-stad/modularity": "dev-3.0/develop", + "helsingborg-stad/modularity": "^3.0.1", "helsingborg-stad/modularity-contact-banner": "dev-3.0/develop", "helsingborg-stad/modularity-entryscape": "^1.0.0", "helsingborg-stad/modularity-form-builder": "dev-3.0/develop", From bf6e492b9cb5ad829f809269c57472f8f90d04ab Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Tue, 26 Sep 2023 14:09:00 +0200 Subject: [PATCH 10/23] chore: Use Stable versions of Algolia index plugins. --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 99461e2..9b0a8f9 100644 --- a/composer.json +++ b/composer.json @@ -40,9 +40,9 @@ "composer/installers": "~1.0", "helsingborg-stad/acf-ux-collapse": ">=1.0.0", "helsingborg-stad/active-directory-api-wp-integration": "^2.4.12", - "helsingborg-stad/algolia-index": "~1.9", - "helsingborg-stad/algolia-index-js-searchpage-addon": "dev-3.0/develop", - "helsingborg-stad/algolia-index-modularity-addon": "^1.0", + "helsingborg-stad/algolia-index": "^2.0.0", + "helsingborg-stad/algolia-index-js-searchpage-addon": "^2.0.0", + "helsingborg-stad/algolia-index-modularity-addon": "^2.0.0", "helsingborg-stad/api-alarm-integration": "dev-3.0/develop", "helsingborg-stad/api-event-manager-integration": "dev-3.0/develop", "helsingborg-stad/api-project-manager-integration": "dev-3.0/develop", From 06ec894efbf7c83e6adaa0c5afbb6ac0b7670655 Mon Sep 17 00:00:00 2001 From: Mackan Date: Tue, 26 Sep 2023 15:07:20 +0200 Subject: [PATCH 11/23] Update versions to latests for helsingborg-stad packages --- composer.json | 82 +++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/composer.json b/composer.json index 9b0a8f9..9992557 100644 --- a/composer.json +++ b/composer.json @@ -38,60 +38,60 @@ "require": { "php": ">=7.4", "composer/installers": "~1.0", - "helsingborg-stad/acf-ux-collapse": ">=1.0.0", - "helsingborg-stad/active-directory-api-wp-integration": "^2.4.12", + "helsingborg-stad/acf-ux-collapse": "2.0.0", + "helsingborg-stad/active-directory-api-wp-integration": "^3.0.0", "helsingborg-stad/algolia-index": "^2.0.0", "helsingborg-stad/algolia-index-js-searchpage-addon": "^2.0.0", "helsingborg-stad/algolia-index-modularity-addon": "^2.0.0", - "helsingborg-stad/api-alarm-integration": "dev-3.0/develop", - "helsingborg-stad/api-event-manager-integration": "dev-3.0/develop", - "helsingborg-stad/api-project-manager-integration": "dev-3.0/develop", - "helsingborg-stad/api-volunteer-manager-integration": ">=1.0.0", - "helsingborg-stad/attachment-revisions": ">=1.0.0", - "helsingborg-stad/better-post-ui": "dev-master", - "helsingborg-stad/broken-link-detector": "dev-whitespace", - "helsingborg-stad/component-library": "dev-master", - "helsingborg-stad/content-scheduler": "^1.2", - "helsingborg-stad/custom-short-links": ">=1.0.0", - "helsingborg-stad/customer-feedback": "dev-3.0/develop", - "helsingborg-stad/easy-to-read-alternative": "dev-3.0/develop", - "helsingborg-stad/force-ssl": ">=1.0.0", - "helsingborg-stad/gdi-modularity-cases": "dev-main", - "helsingborg-stad/gdi-modularity-invoices": "dev-main", - "helsingborg-stad/gdi-modularity-my-pages-about-me": "dev-main", - "helsingborg-stad/global-blade-engine": "1.3.0", - "helsingborg-stad/job-listings": "dev-3.0/develop", + "helsingborg-stad/api-alarm-integration": "^2.0.0", + "helsingborg-stad/api-event-manager-integration": "^1.0.0", + "helsingborg-stad/api-project-manager-integration": "^2.0.0", + "helsingborg-stad/api-volunteer-manager-integration": "^2.0.0", + "helsingborg-stad/attachment-revisions": "^2.0.0", + "helsingborg-stad/better-post-ui": "^2.0.0", + "helsingborg-stad/broken-link-detector": "^2.0.0", + "helsingborg-stad/component-library": "^2.0.0", + "helsingborg-stad/content-scheduler": "^2.0.0", + "helsingborg-stad/custom-short-links": "^2.0.0", + "helsingborg-stad/customer-feedback": "^3.0.0", + "helsingborg-stad/easy-to-read-alternative": "^2.0.0", + "helsingborg-stad/force-ssl": "^2.0.0", + "helsingborg-stad/gdi-modularity-cases": "^1.0.0", + "helsingborg-stad/gdi-modularity-invoices": "^1.0.0", + "helsingborg-stad/gdi-modularity-my-pages-about-me": "^1.0.0", + "helsingborg-stad/global-blade-engine": "^2.0.0", + "helsingborg-stad/job-listings": "^3.0.0", "helsingborg-stad/like-posts": "dev-main", - "helsingborg-stad/lix-calculator": ">=1.0.1", - "helsingborg-stad/media-usage": "^1.0", - "helsingborg-stad/mod-my-pages": "dev-main", + "helsingborg-stad/lix-calculator": "^3.0.0", + "helsingborg-stad/media-usage": "^2.0.0", + "helsingborg-stad/mod-my-pages": "`^1.0.0", "helsingborg-stad/modularity": "^3.0.1", - "helsingborg-stad/modularity-contact-banner": "dev-3.0/develop", - "helsingborg-stad/modularity-entryscape": "^1.0.0", - "helsingborg-stad/modularity-form-builder": "dev-3.0/develop", - "helsingborg-stad/modularity-guides": "dev-3.0/develop", - "helsingborg-stad/modularity-interactive-img-map": "dev-3.0/develop", - "helsingborg-stad/modularity-json-render": "dev-3.0/develop", - "helsingborg-stad/modularity-local-events": "^1.0", + "helsingborg-stad/modularity-contact-banner": "^2.0.0", + "helsingborg-stad/modularity-entryscape": "^2.0.0", + "helsingborg-stad/modularity-form-builder": "^2.0.0", + "helsingborg-stad/modularity-guides": "^3.0.0", + "helsingborg-stad/modularity-interactive-img-map": "^3.0.0", + "helsingborg-stad/modularity-json-render": "^2.0.0", + "helsingborg-stad/modularity-local-events": "^2.0.0", "helsingborg-stad/modularity-open-street-map": "dev-main", - "helsingborg-stad/modularity-products": "dev-master", - "helsingborg-stad/modularity-recommend": "dev-master", - "helsingborg-stad/modularity-sections": "dev-3.0/develop", - "helsingborg-stad/modularity-testimonials": "dev-3.0/develop", - "helsingborg-stad/modularity-timeline": "dev-3.0/master", + "helsingborg-stad/modularity-products": "^1.0.0", + "helsingborg-stad/modularity-recommend": "^1.0.0", + "helsingborg-stad/modularity-sections": "^2.0.0", + "helsingborg-stad/modularity-testimonials": "^2.0.0", + "helsingborg-stad/modularity-timeline": "^2.0.0", "helsingborg-stad/multi-network-urls": "^1.0.1", - "helsingborg-stad/multisite-role-propagation": "^1.0", + "helsingborg-stad/multisite-role-propagation": "^2.0.0", "helsingborg-stad/municipio": "^3.0.1", - "helsingborg-stad/redirection-extended": "^1.0", + "helsingborg-stad/redirection-extended": "^2.0.0", "helsingborg-stad/s3-uploads-custom-endpoint": "^1.0.0", - "helsingborg-stad/search-notices": ">=1.0.0", - "helsingborg-stad/visit-custom-posttypes-taxonomies": "dev-master", + "helsingborg-stad/search-notices": "^2.0.0", + "helsingborg-stad/visit-custom-posttypes-taxonomies": "^1.0.0", "helsingborg-stad/wp-page-for-post-type": ">=1.0.0", - "helsingborg-stad/wp-page-for-term": "^1.0", + "helsingborg-stad/wp-page-for-term": "^2.0.0", "helsingborg-stad/wp-search-statistics": ">=0.1.0", "helsingborg-stad/wpmu-acf-google-maps-key": "dev-main", "helsingborg-stad/wpmu-litespeed-common-settings": "^1.0.0", - "helsingborg-stad/wpmu-network-admin-url": "dev-master", + "helsingborg-stad/wpmu-network-admin-url": "^1.0.0", "helsingborg-stad/wpmu-mu-plugins-url-everywhere": "~1.0.0", "humanmade/s3-uploads": "^3.0.4", "johnpbloch/wordpress": "6.3.1", From 5a53845a481180b5d30f68cc37db9b7b7e85bfea Mon Sep 17 00:00:00 2001 From: Mackan Date: Tue, 26 Sep 2023 15:33:59 +0200 Subject: [PATCH 12/23] Update versions of missed packages --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 9992557..6d3af90 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ "helsingborg-stad/gdi-modularity-my-pages-about-me": "^1.0.0", "helsingborg-stad/global-blade-engine": "^2.0.0", "helsingborg-stad/job-listings": "^3.0.0", - "helsingborg-stad/like-posts": "dev-main", + "helsingborg-stad/like-posts": "^1.0.0", "helsingborg-stad/lix-calculator": "^3.0.0", "helsingborg-stad/media-usage": "^2.0.0", "helsingborg-stad/mod-my-pages": "`^1.0.0", @@ -73,7 +73,7 @@ "helsingborg-stad/modularity-interactive-img-map": "^3.0.0", "helsingborg-stad/modularity-json-render": "^2.0.0", "helsingborg-stad/modularity-local-events": "^2.0.0", - "helsingborg-stad/modularity-open-street-map": "dev-main", + "helsingborg-stad/modularity-open-street-map": "^1.0.0", "helsingborg-stad/modularity-products": "^1.0.0", "helsingborg-stad/modularity-recommend": "^1.0.0", "helsingborg-stad/modularity-sections": "^2.0.0", @@ -86,11 +86,11 @@ "helsingborg-stad/s3-uploads-custom-endpoint": "^1.0.0", "helsingborg-stad/search-notices": "^2.0.0", "helsingborg-stad/visit-custom-posttypes-taxonomies": "^1.0.0", - "helsingborg-stad/wp-page-for-post-type": ">=1.0.0", + "helsingborg-stad/wp-page-for-post-type": "^2.0.0", "helsingborg-stad/wp-page-for-term": "^2.0.0", - "helsingborg-stad/wp-search-statistics": ">=0.1.0", - "helsingborg-stad/wpmu-acf-google-maps-key": "dev-main", - "helsingborg-stad/wpmu-litespeed-common-settings": "^1.0.0", + "helsingborg-stad/wp-search-statistics": "^1.0.0", + "helsingborg-stad/wpmu-acf-google-maps-key": "^1.0.0", + "helsingborg-stad/wpmu-litespeed-common-settings": "^2.0.0", "helsingborg-stad/wpmu-network-admin-url": "^1.0.0", "helsingborg-stad/wpmu-mu-plugins-url-everywhere": "~1.0.0", "humanmade/s3-uploads": "^3.0.4", From 09095e13812622a248e45714f2df46c31e8ac2f5 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Tue, 26 Sep 2023 15:49:03 +0200 Subject: [PATCH 13/23] Set some version constraints --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6d3af90..7bd40a8 100644 --- a/composer.json +++ b/composer.json @@ -79,11 +79,11 @@ "helsingborg-stad/modularity-sections": "^2.0.0", "helsingborg-stad/modularity-testimonials": "^2.0.0", "helsingborg-stad/modularity-timeline": "^2.0.0", - "helsingborg-stad/multi-network-urls": "^1.0.1", + "helsingborg-stad/multi-network-urls": "^2.0.0", "helsingborg-stad/multisite-role-propagation": "^2.0.0", "helsingborg-stad/municipio": "^3.0.1", "helsingborg-stad/redirection-extended": "^2.0.0", - "helsingborg-stad/s3-uploads-custom-endpoint": "^1.0.0", + "helsingborg-stad/s3-uploads-custom-endpoint": "^2.0.0", "helsingborg-stad/search-notices": "^2.0.0", "helsingborg-stad/visit-custom-posttypes-taxonomies": "^1.0.0", "helsingborg-stad/wp-page-for-post-type": "^2.0.0", From fb29a9e53dc89d8e657b1d440c9048bad3dc734a Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Tue, 26 Sep 2023 16:10:47 +0200 Subject: [PATCH 14/23] fix: correct typo on version constraint. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7bd40a8..8298b50 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "helsingborg-stad/like-posts": "^1.0.0", "helsingborg-stad/lix-calculator": "^3.0.0", "helsingborg-stad/media-usage": "^2.0.0", - "helsingborg-stad/mod-my-pages": "`^1.0.0", + "helsingborg-stad/mod-my-pages": "^1.0.0", "helsingborg-stad/modularity": "^3.0.1", "helsingborg-stad/modularity-contact-banner": "^2.0.0", "helsingborg-stad/modularity-entryscape": "^2.0.0", From 548e24b655b09816edd6598d12aed9c280b47fd2 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Wed, 27 Sep 2023 15:55:39 +0200 Subject: [PATCH 15/23] feat!: remove content insights for editors. This prevents creating a installable. --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 8298b50..52801c3 100644 --- a/composer.json +++ b/composer.json @@ -96,7 +96,6 @@ "humanmade/s3-uploads": "^3.0.4", "johnpbloch/wordpress": "6.3.1", "municipio-se/modularity-noticeboard": "1.0.0", - "municipio/content-insights-for-editors": "dev-master", "wikimedia/composer-merge-plugin": "dev-master", "wpackagist-plugin/acf-extended": "0.8.8.7", "wpackagist-plugin/autodescription": ">=2.9.0", From a9254e5a1626d790a4b9c6f8fabf76d21a90e098 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Wed, 27 Sep 2023 16:00:02 +0200 Subject: [PATCH 16/23] feat: Add a WordPress style header to this main file. --- index.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 060fc83..5669522 100755 --- a/index.php +++ b/index.php @@ -1,9 +1,13 @@ Date: Wed, 27 Sep 2023 16:00:46 +0200 Subject: [PATCH 17/23] feat!: Add automatic releases --- .github/workflows/release.yml | 22 ++++++++++++++++++++++ GitVersion.yml | 9 +++++++++ 2 files changed, 31 insertions(+) create mode 100644 .github/workflows/release.yml create mode 100644 GitVersion.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..90284e5 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,22 @@ +name: Bump version and create release + +on: + push: + branches: [main] + +jobs: + release: + runs-on: ubuntu-latest + + steps: + + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Create Release and bump version files + uses: helsingborg-stad/release-wp-plugin-action@1.0.1 + with: + php-version: 8.2 + node-version: 20.6.0 \ No newline at end of file diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000..e38ac35 --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,9 @@ +mode: MainLine +major-version-bump-message: "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\([\\w\\s-]*\\))?(!:|:.*\\n\\n((.+\\n)+\\n)?BREAKING CHANGE:\\s.+)" +minor-version-bump-message: "^(feat)(\\([\\w\\s-]*\\))?:" +patch-version-bump-message: "^(build|chore|ci|docs|fix|perf|refactor|revert|style|test)(\\([\\w\\s-]*\\))?:" + +branches: + main: + regex: ^main$|^master$ + is-release-branch: true \ No newline at end of file From 072deef59f157147b859ed52d6def5a896edd4d6 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Wed, 27 Sep 2023 16:10:35 +0200 Subject: [PATCH 18/23] fix: remove vcs for broken link detector --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 52801c3..f7134b1 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,6 @@ }, "minimum-stability" : "dev", "repositories": [ - { - "type": "vcs", - "url": "https://github.com/whitespace-se/broken-link-detector" - }, { "type":"composer", "url":"https://packagist.org" From 22f9ac2b713922b8b40f40c14e2b3a3eff5e8758 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Wed, 27 Sep 2023 16:27:55 +0200 Subject: [PATCH 19/23] Remove version automation --- .github/workflows/release.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 90284e5..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Bump version and create release - -on: - push: - branches: [main] - -jobs: - release: - runs-on: ubuntu-latest - - steps: - - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Create Release and bump version files - uses: helsingborg-stad/release-wp-plugin-action@1.0.1 - with: - php-version: 8.2 - node-version: 20.6.0 \ No newline at end of file From 7d177d681ac20d48388ab3a0b40e57ca902caa01 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Thu, 28 Sep 2023 11:51:59 +0200 Subject: [PATCH 20/23] Update requirement on noticeboard & ux collapse --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f7134b1..87d88bb 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "require": { "php": ">=7.4", "composer/installers": "~1.0", - "helsingborg-stad/acf-ux-collapse": "2.0.0", + "helsingborg-stad/acf-ux-collapse": "^2.0.0", "helsingborg-stad/active-directory-api-wp-integration": "^3.0.0", "helsingborg-stad/algolia-index": "^2.0.0", "helsingborg-stad/algolia-index-js-searchpage-addon": "^2.0.0", @@ -91,7 +91,7 @@ "helsingborg-stad/wpmu-mu-plugins-url-everywhere": "~1.0.0", "humanmade/s3-uploads": "^3.0.4", "johnpbloch/wordpress": "6.3.1", - "municipio-se/modularity-noticeboard": "1.0.0", + "municipio-se/modularity-noticeboard": "^1.0.0", "wikimedia/composer-merge-plugin": "dev-master", "wpackagist-plugin/acf-extended": "0.8.8.7", "wpackagist-plugin/autodescription": ">=2.9.0", From fdbc1f6a539668ca3353522369f83eebb0ca1eb2 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Thu, 28 Sep 2023 12:32:43 +0200 Subject: [PATCH 21/23] chore: update algoilia index major versions --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 87d88bb..95c1cc0 100644 --- a/composer.json +++ b/composer.json @@ -36,9 +36,9 @@ "composer/installers": "~1.0", "helsingborg-stad/acf-ux-collapse": "^2.0.0", "helsingborg-stad/active-directory-api-wp-integration": "^3.0.0", - "helsingborg-stad/algolia-index": "^2.0.0", + "helsingborg-stad/algolia-index": "^3.0.0", "helsingborg-stad/algolia-index-js-searchpage-addon": "^2.0.0", - "helsingborg-stad/algolia-index-modularity-addon": "^2.0.0", + "helsingborg-stad/algolia-index-modularity-addon": "^3.0.0", "helsingborg-stad/api-alarm-integration": "^2.0.0", "helsingborg-stad/api-event-manager-integration": "^1.0.0", "helsingborg-stad/api-project-manager-integration": "^2.0.0", From e097e569440ac93c5c114a02f785eff040ef1177 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Thu, 28 Sep 2023 13:14:09 +0200 Subject: [PATCH 22/23] fix: update content scheduler major. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 95c1cc0..d9ca5b2 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "helsingborg-stad/better-post-ui": "^2.0.0", "helsingborg-stad/broken-link-detector": "^2.0.0", "helsingborg-stad/component-library": "^2.0.0", - "helsingborg-stad/content-scheduler": "^2.0.0", + "helsingborg-stad/content-scheduler": "^3.0.0", "helsingborg-stad/custom-short-links": "^2.0.0", "helsingborg-stad/customer-feedback": "^3.0.0", "helsingborg-stad/easy-to-read-alternative": "^2.0.0", From e4b143b1593ab9965726ecfe896cf29e05d35a03 Mon Sep 17 00:00:00 2001 From: Sebastian Thulin Date: Thu, 28 Sep 2023 14:16:29 +0200 Subject: [PATCH 23/23] chore: update version on media usage. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d9ca5b2..6bb7248 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "helsingborg-stad/job-listings": "^3.0.0", "helsingborg-stad/like-posts": "^1.0.0", "helsingborg-stad/lix-calculator": "^3.0.0", - "helsingborg-stad/media-usage": "^2.0.0", + "helsingborg-stad/media-usage": "^3.0.0", "helsingborg-stad/mod-my-pages": "^1.0.0", "helsingborg-stad/modularity": "^3.0.1", "helsingborg-stad/modularity-contact-banner": "^2.0.0",