From cfc6cc1c591129418ea072da520a509ed39c3354 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Mon, 14 Aug 2023 08:45:06 +0000 Subject: [PATCH 1/6] Update configuration --- composer.lock | 38 ++++++++++--------- ...tities.external_entity_type.helfi_news.yml | 2 +- ...external_entity_type.helfi_news_groups.yml | 2 +- ..._entity_type.helfi_news_neighbourhoods.yml | 2 +- ...s.external_entity_type.helfi_news_tags.yml | 2 +- docker/openshift/Dockerfile | 2 +- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/composer.lock b/composer.lock index 7f1deaa6..6362496b 100644 --- a/composer.lock +++ b/composer.lock @@ -3935,16 +3935,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.17", + "version": "2.4.18", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "4c3d285d0399b949db2ec6443fdd04937ee22532" + "reference": "ae834a75fff07abb6a52ce6eafe2617dcdbb23e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4c3d285d0399b949db2ec6443fdd04937ee22532", - "reference": "4c3d285d0399b949db2ec6443fdd04937ee22532", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/ae834a75fff07abb6a52ce6eafe2617dcdbb23e5", + "reference": "ae834a75fff07abb6a52ce6eafe2617dcdbb23e5", "shasum": "" }, "require": { @@ -3970,10 +3970,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.17", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.18", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-08-04T05:28:12+00:00" + "time": "2023-08-14T08:36:44+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4195,16 +4195,16 @@ }, { "name": "drupal/helfi_proxy", - "version": "3.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "f5125c5569c04781730d1420f0d1886ba1096c1f" + "reference": "257e937e6e1d77e8da5ec1ef20f133109b9b1ed4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/f5125c5569c04781730d1420f0d1886ba1096c1f", - "reference": "f5125c5569c04781730d1420f0d1886ba1096c1f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/257e937e6e1d77e8da5ec1ef20f133109b9b1ed4", + "reference": "257e937e6e1d77e8da5ec1ef20f133109b9b1ed4", "shasum": "" }, "require": { @@ -4221,6 +4221,8 @@ "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3", + "drupal/helfi_tunnistamo": "*", + "drupal/redirect": "^1.0", "drupal/simple_sitemap": "^4.1", "phpspec/prophecy-phpunit": "^2" }, @@ -4230,10 +4232,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2023-03-14T06:27:48+00:00" + "time": "2023-08-11T05:35:26+00:00" }, { "name": "drupal/helfi_tpr", @@ -15752,16 +15754,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d" + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b2fe4d22a5426f38e014855322200b97b5362c0d", - "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", "shasum": "" }, "require": { @@ -15804,9 +15806,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" }, - "time": "2023-05-30T18:13:47+00:00" + "time": "2023-08-12T11:01:26+00:00" }, { "name": "phpspec/prophecy", diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml index 4f168661..0757ae12 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -8,8 +8,8 @@ id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml index 87f8bf25..1233d5a1 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -8,8 +8,8 @@ id: helfi_news_groups label: 'Helfi: News groups' label_plural: 'Helfi: News groups' description: 'Retrieves news groups taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml index 756e4998..2d053adc 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods label: 'Helfi: News neighbourhoods' label_plural: 'Helfi: News neighbourhoods' description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml index ed2e731e..41e8e55f 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -8,8 +8,8 @@ id: helfi_news_tags label: 'Helfi: News tags' label_plural: 'Helfi: News tags' description: 'Retrieves news tags taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile index 16e12dea..007fefd3 100644 --- a/docker/openshift/Dockerfile +++ b/docker/openshift/Dockerfile @@ -1,4 +1,4 @@ -ARG DRUPAL_DOCKER_TAG=8.1 +ARG DRUPAL_DOCKER_TAG=8.2 FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG} COPY / /var/www/html/ From 2e6b35c699ad506416619fe28182dada03c8403d Mon Sep 17 00:00:00 2001 From: tuutti Date: Thu, 17 Aug 2023 08:51:33 +0300 Subject: [PATCH 2/6] UHF-8829: Run composer with --no-interaction flag --- .github/workflows/artifact.yml | 9 ++------- .github/workflows/test.yml | 7 ++----- .github/workflows/update-config.yml | 10 +++------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml index 461e0844..738b13e2 100644 --- a/.github/workflows/artifact.yml +++ b/.github/workflows/artifact.yml @@ -5,16 +5,11 @@ on: schedule: - cron: '0 0 * * 0' name: Build artifacts -env: - DRUPAL_BUILD_FROM_SCRATCH: true - SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal" - SIMPLETEST_BASE_URL: "http://127.0.0.1:8080" - XDEBUG_MODE: off jobs: build: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine services: db: @@ -33,7 +28,7 @@ jobs: fetch-depth: 1 - name: Build project - run: composer install + run: composer install --no-interaction - name: Setup drupal and save database dump run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 072a4a91..975c3a4e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,15 +4,12 @@ on: branches: ['main', 'dev'] name: CI env: - SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal" - SIMPLETEST_BASE_URL: "http://127.0.0.1:8080" SYMFONY_DEPRECATIONS_HELPER: disabled - XDEBUG_MODE: off jobs: tests: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine services: db: @@ -31,7 +28,7 @@ jobs: fetch-depth: 1 - name: Build project - run: composer install + run: composer install --no-interaction - name: Scan security updates run: drush pm:security diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index 611a012d..3b23fc74 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -3,15 +3,11 @@ on: repository_dispatch: types: [config_change] name: Update config -env: - SIMPLETEST_BASE_URL: "http://127.0.0.1:8080" - SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal" - XDEBUG_MODE: off jobs: update-config: runs-on: ubuntu-latest container: - image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine + image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine services: db: @@ -37,10 +33,10 @@ jobs: - name: Build project run: | - composer install + composer install --no-interaction $(drush sql:connect) < latest.sql drush cim -y && drush updb -y && drush cr - composer update drupal/helfi_* drupal/hdbt* -W + composer update drupal/helfi_* drupal/hdbt* -W --no-interaction drush cr && drush updb -y && drush cex -y # Update platform drush helfi:tools:update-platform From 77cdce0ec91dd9a47d0b8001610ff92739b30486 Mon Sep 17 00:00:00 2001 From: Jussiles Date: Fri, 18 Aug 2023 16:55:56 +0300 Subject: [PATCH 3/6] UHF-8845: add sitemap urls in en instead of fi. --- .../simple_sitemap.custom_links.default.yml | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/conf/cmi/simple_sitemap.custom_links.default.yml b/conf/cmi/simple_sitemap.custom_links.default.yml index d8d60206..3cd6e680 100644 --- a/conf/cmi/simple_sitemap.custom_links.default.yml +++ b/conf/cmi/simple_sitemap.custom_links.default.yml @@ -4,93 +4,93 @@ links: priority: '1.0' changefreq: daily - - path: '/etsi-avoimia-tyopaikkoja?task_areas=32&page=1' + path: '/find-open-jobs?task_areas=32&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=33&page=1' + path: '/find-open-jobs?task_areas=33&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=34&page=1' + path: '/find-open-jobs?task_areas=34&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=35&page=1' + path: '/find-open-jobs?task_areas=35&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=36&page=1' + path: '/find-open-jobs?task_areas=36&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=37&page=1' + path: '/find-open-jobs?task_areas=37&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=240&page=1' + path: '/find-open-jobs?task_areas=240&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=241&page=1' + path: '/find-open-jobs?task_areas=241&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=242&page=1' + path: '/find-open-jobs?task_areas=242&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=253&page=1' + path: '/find-open-jobs?task_areas=253&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=255&page=1' + path: '/find-open-jobs?task_areas=255&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=256&page=1' + path: '/find-open-jobs?task_areas=256&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=257&page=1' + path: '/find-open-jobs?task_areas=257&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=258&page=1' + path: '/find-open-jobs?task_areas=258&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=982&page=1' + path: '/find-open-jobs?task_areas=982&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=984&page=1' + path: '/find-open-jobs?task_areas=984&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=985&page=1' + path: '/find-open-jobs?task_areas=985&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=986&page=1' + path: '/find-open-jobs?task_areas=986&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=987&page=1' + path: '/find-open-jobs?task_areas=987&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=981&page=1' + path: '/find-open-jobs?task_areas=981&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=1097&page=1' + path: '/find-open-jobs?task_areas=1097&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=1098&page=1' + path: '/find-open-jobs?task_areas=1098&page=1' priority: '1.0' changefreq: '' - - path: '/etsi-avoimia-tyopaikkoja?task_areas=1099&page=1' + path: '/find-open-jobs?task_areas=1099&page=1' priority: '1.0' From 86fb36a4561328f2f4e73f7513cc007cc6306916 Mon Sep 17 00:00:00 2001 From: tuutti Date: Tue, 22 Aug 2023 07:56:56 +0300 Subject: [PATCH 4/6] UHF-8802: Non-linguistic URLs --- conf/cmi/helfi_proxy.settings.yml | 1 + public/sites/default/staging.settings.php | 1 + public/sites/default/testing.settings.php | 1 + 3 files changed, 3 insertions(+) diff --git a/conf/cmi/helfi_proxy.settings.yml b/conf/cmi/helfi_proxy.settings.yml index 08c1abf7..60d6f3c8 100644 --- a/conf/cmi/helfi_proxy.settings.yml +++ b/conf/cmi/helfi_proxy.settings.yml @@ -5,3 +5,4 @@ prefixes: fi: avoimet-tyopaikat sv: lediga-jobb ru: open-jobs + zxx: open-jobs diff --git a/public/sites/default/staging.settings.php b/public/sites/default/staging.settings.php index e21d55b8..25b1dfa9 100644 --- a/public/sites/default/staging.settings.php +++ b/public/sites/default/staging.settings.php @@ -9,4 +9,5 @@ 'fi' => 'staging-avoimet-tyopaikat', 'sv' => 'staging-lediga-jobb', 'ru' => 'staging-open-jobs', + 'zxx' => 'staging-open-jobs', ]; diff --git a/public/sites/default/testing.settings.php b/public/sites/default/testing.settings.php index e2ad466f..60d85447 100644 --- a/public/sites/default/testing.settings.php +++ b/public/sites/default/testing.settings.php @@ -8,4 +8,5 @@ 'fi' => 'test-avoimet-tyopaikat', 'sv' => 'test-lediga-jobb', 'ru' => 'test-open-jobs', + 'zxx' => 'test-open-jobs', ]; From 20aec7d8bed7dc44c83d2804d9b5412fcd3805f6 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 29 Aug 2023 08:56:07 +0000 Subject: [PATCH 5/6] Update configuration --- composer.lock | 242 +++++++++--------- ...er_add_role_action.super_administrator.yml | 14 + ...remove_role_action.super_administrator.yml | 14 + conf/cmi/user.role.super_administrator.yml | 9 + docker/openshift/Dockerfile | 7 +- tools/make/include.mk | 5 - tools/make/kubectl.mk | 1 + tools/make/wordpress.mk | 98 ------- 8 files changed, 163 insertions(+), 227 deletions(-) create mode 100644 conf/cmi/system.action.user_add_role_action.super_administrator.yml create mode 100644 conf/cmi/system.action.user_remove_role_action.super_administrator.yml create mode 100644 conf/cmi/user.role.super_administrator.yml delete mode 100644 tools/make/wordpress.mk diff --git a/composer.lock b/composer.lock index 6362496b..65d4fde7 100644 --- a/composer.lock +++ b/composer.lock @@ -2719,17 +2719,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.0.13", + "version": "2.0.14", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.0.13" + "reference": "2.0.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.13.zip", - "reference": "2.0.13", - "shasum": "2c1683f0c075918c74f7ccd526f7bc787f260a7f" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.14.zip", + "reference": "2.0.14", + "shasum": "ac0e3d232f3c36e0d7759f1991e08ef767d11acd" }, "require": { "drupal/core": "^9 || ^10" @@ -2737,8 +2737,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.13", - "datestamp": "1690052595", + "version": "2.0.14", + "datestamp": "1692130094", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3598,7 +3598,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/flysystem_azure.git", - "reference": "1f54cbcccaf9a7a609a48353fca78c3bdca71f1d" + "reference": "a29917177083ecb457f524ac8c7ff7e478c697e0" }, "require": { "drupal/core": "^8 || ^9", @@ -3613,7 +3613,7 @@ }, "drupal": { "version": "1.0.x-dev", - "datestamp": "1620053329", + "datestamp": "1692017626", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3816,16 +3816,16 @@ }, { "name": "drupal/hdbt", - "version": "5.5.2", + "version": "5.5.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4" + "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4", - "reference": "cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", + "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", "shasum": "" }, "require": { @@ -3843,10 +3843,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.2", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.9", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-09T07:34:44+00:00" + "time": "2023-08-28T13:26:21+00:00" }, { "name": "drupal/hdbt_admin", @@ -3935,16 +3935,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.18", + "version": "2.4.19", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "ae834a75fff07abb6a52ce6eafe2617dcdbb23e5" + "reference": "917de458ac2ed2b046a9c4125094f3d233c47289" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/ae834a75fff07abb6a52ce6eafe2617dcdbb23e5", - "reference": "ae834a75fff07abb6a52ce6eafe2617dcdbb23e5", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/917de458ac2ed2b046a9c4125094f3d233c47289", + "reference": "917de458ac2ed2b046a9c4125094f3d233c47289", "shasum": "" }, "require": { @@ -3970,10 +3970,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.18", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.19", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-08-14T08:36:44+00:00" + "time": "2023-08-25T05:23:13+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4076,16 +4076,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.2", + "version": "3.3.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a44de2707583ec84fce7ddbef86906d00749d239" + "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a44de2707583ec84fce7ddbef86906d00749d239", - "reference": "a44de2707583ec84fce7ddbef86906d00749d239", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a9f447f9a9e681a73ec609423c82b4e004d2e0aa", + "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa", "shasum": "" }, "require": { @@ -4188,10 +4188,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.2", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.6", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-10T06:02:41+00:00" + "time": "2023-08-29T07:11:13+00:00" }, { "name": "drupal/helfi_proxy", @@ -5005,17 +5005,17 @@ }, { "name": "drupal/oembed_providers", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/oembed_providers.git", - "reference": "2.1.1" + "reference": "2.1.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.1.1.zip", - "reference": "2.1.1", - "shasum": "d0f87b92528b082d25f8b84b82a84d118fed12e0" + "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.1.2.zip", + "reference": "2.1.2", + "shasum": "ad125c7e55555499f001755c365f96edce1d6343" }, "require": { "drupal/core": "^9.0|^10.0" @@ -5023,8 +5023,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.1", - "datestamp": "1683987092", + "version": "2.1.2", + "datestamp": "1692724351", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7560,22 +7560,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.7.0", + "version": "7.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -7666,7 +7666,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.7.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.0" }, "funding": [ { @@ -7682,7 +7682,7 @@ "type": "tidelift" } ], - "time": "2023-05-21T14:04:53+00:00" + "time": "2023-08-27T10:20:53+00:00" }, { "name": "guzzlehttp/promises", @@ -9883,32 +9883,32 @@ }, { "name": "phrity/net-uri", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/sirn-se/phrity-net-uri.git", - "reference": "c6ecf127e7c99a41ce04d3cdcda7f51108dd96f7" + "reference": "3f458e0c4d1ddc0e218d7a5b9420127c63925f43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirn-se/phrity-net-uri/zipball/c6ecf127e7c99a41ce04d3cdcda7f51108dd96f7", - "reference": "c6ecf127e7c99a41ce04d3cdcda7f51108dd96f7", + "url": "https://api.github.com/repos/sirn-se/phrity-net-uri/zipball/3f458e0c4d1ddc0e218d7a5b9420127c63925f43", + "reference": "3f458e0c4d1ddc0e218d7a5b9420127c63925f43", "shasum": "" }, "require": { - "php": "^7.4|^8.0", + "php": "^7.4 | ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 | ^2.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.0", - "phpunit/phpunit": "^9.0", + "phpunit/phpunit": "^9.0 | ^10.0", "squizlabs/php_codesniffer": "^3.0" }, "type": "library", "autoload": { "psr-4": { - "": "src/" + "Phrity\\Net\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -9932,9 +9932,9 @@ ], "support": { "issues": "https://github.com/sirn-se/phrity-net-uri/issues", - "source": "https://github.com/sirn-se/phrity-net-uri/tree/1.2.0" + "source": "https://github.com/sirn-se/phrity-net-uri/tree/1.3.0" }, - "time": "2022-11-30T07:20:06+00:00" + "time": "2023-08-21T10:33:06+00:00" }, { "name": "phrity/util-errorhandler", @@ -11995,16 +11995,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -12019,7 +12019,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12057,7 +12057,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -12073,20 +12073,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "927013f3aac555983a5059aada98e1907d842695" + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", - "reference": "927013f3aac555983a5059aada98e1907d842695", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", "shasum": "" }, "require": { @@ -12101,7 +12101,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12140,7 +12140,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.28.0" }, "funding": [ { @@ -12156,20 +12156,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -12181,7 +12181,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12221,7 +12221,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -12237,20 +12237,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -12264,7 +12264,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12308,7 +12308,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" }, "funding": [ { @@ -12324,20 +12324,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -12349,7 +12349,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12392,7 +12392,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -12408,20 +12408,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -12436,7 +12436,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12475,7 +12475,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -12491,20 +12491,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -12513,7 +12513,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12551,7 +12551,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" }, "funding": [ { @@ -12567,20 +12567,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -12589,7 +12589,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12630,7 +12630,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -12646,20 +12646,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -12668,7 +12668,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -12713,7 +12713,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -12729,7 +12729,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", @@ -13508,16 +13508,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.26", + "version": "v5.4.28", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e706c99b4a6f4d9383b52b80dd8c74880501e314" + "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e706c99b4a6f4d9383b52b80dd8c74880501e314", - "reference": "e706c99b4a6f4d9383b52b80dd8c74880501e314", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", + "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", "shasum": "" }, "require": { @@ -13577,7 +13577,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.26" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.28" }, "funding": [ { @@ -13593,7 +13593,7 @@ "type": "tidelift" } ], - "time": "2023-07-13T07:32:46+00:00" + "time": "2023-08-24T13:38:36+00:00" }, { "name": "symfony/yaml", diff --git a/conf/cmi/system.action.user_add_role_action.super_administrator.yml b/conf/cmi/system.action.user_add_role_action.super_administrator.yml new file mode 100644 index 00000000..8037911a --- /dev/null +++ b/conf/cmi/system.action.user_add_role_action.super_administrator.yml @@ -0,0 +1,14 @@ +uuid: b4771df8-e4ea-4fbc-b9c3-80cf0be75387 +langcode: en +status: true +dependencies: + config: + - user.role.super_administrator + module: + - user +id: user_add_role_action.super_administrator +label: 'Add the Super administrator role to the selected user(s)' +type: user +plugin: user_add_role_action +configuration: + rid: super_administrator diff --git a/conf/cmi/system.action.user_remove_role_action.super_administrator.yml b/conf/cmi/system.action.user_remove_role_action.super_administrator.yml new file mode 100644 index 00000000..e6ab6a1b --- /dev/null +++ b/conf/cmi/system.action.user_remove_role_action.super_administrator.yml @@ -0,0 +1,14 @@ +uuid: ac41f299-4da8-46a7-91fc-8b2c48165bad +langcode: en +status: true +dependencies: + config: + - user.role.super_administrator + module: + - user +id: user_remove_role_action.super_administrator +label: 'Remove the Super administrator role from the selected user(s)' +type: user +plugin: user_remove_role_action +configuration: + rid: super_administrator diff --git a/conf/cmi/user.role.super_administrator.yml b/conf/cmi/user.role.super_administrator.yml new file mode 100644 index 00000000..7689c958 --- /dev/null +++ b/conf/cmi/user.role.super_administrator.yml @@ -0,0 +1,9 @@ +uuid: 74097722-87f0-4067-9a1a-de4e42b68948 +langcode: en +status: true +dependencies: { } +id: super_administrator +label: 'Super administrator' +weight: 7 +is_admin: true +permissions: { } diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile index 007fefd3..25b26fa5 100644 --- a/docker/openshift/Dockerfile +++ b/docker/openshift/Dockerfile @@ -5,9 +5,10 @@ COPY / /var/www/html/ WORKDIR /var/www/html RUN composer install --no-progress --profile --prefer-dist --no-interaction --no-dev --optimize-autoloader -# Copy deploy script -COPY docker/openshift/entrypoints/20-deploy.sh /entrypoints -RUN chmod +x /entrypoints/20-deploy.sh +# Copy ALL deploy scripts +COPY docker/openshift/entrypoints/ /entrypoints +RUN chmod +x /entrypoints/* + # Copy cron scripts RUN mkdir /crons diff --git a/tools/make/include.mk b/tools/make/include.mk index 2216bc1f..cf95f4d5 100644 --- a/tools/make/include.mk +++ b/tools/make/include.mk @@ -12,7 +12,6 @@ include $(DRUIDFI_TOOLS_MAKE_DIR)qa.mk IS_DRUPAL ?= $(shell test -f $(WEBROOT)/sites/default/settings.php && echo yes || echo no) IS_SYMFONY ?= $(shell test -f config/bundles.php && echo yes || echo no) -IS_WP ?= $(shell (test -f $(WEBROOT)/wp-settings.php || test -f conf/wp-config.php) && echo yes || echo no) ifeq ($(IS_DRUPAL),yes) include $(DRUIDFI_TOOLS_MAKE_DIR)drupal.mk @@ -22,10 +21,6 @@ ifeq ($(IS_SYMFONY),yes) include $(DRUIDFI_TOOLS_MAKE_DIR)symfony.mk endif -ifeq ($(IS_WP),yes) -include $(DRUIDFI_TOOLS_MAKE_DIR)wordpress.mk -endif - # # Hosting systems # diff --git a/tools/make/kubectl.mk b/tools/make/kubectl.mk index 91237eff..c85f123f 100644 --- a/tools/make/kubectl.mk +++ b/tools/make/kubectl.mk @@ -6,6 +6,7 @@ KUBECTL_WORKDIR ?= /app PHONY += kubectl-sync-db kubectl-sync-db: ## Sync database from Kubernetes + $(call drush,sql-drop --quiet -y) ifeq ($(DUMP_SQL_EXISTS),no) $(eval POD := $(call kubectl_get_pod)) $(call step,Get database dump from $(POD)...\n) diff --git a/tools/make/wordpress.mk b/tools/make/wordpress.mk deleted file mode 100644 index b6af511c..00000000 --- a/tools/make/wordpress.mk +++ /dev/null @@ -1,98 +0,0 @@ -WP_FRESH_TARGETS := up build sync post-install -BUILD_TARGETS += set-files -WP_CONF_PATH := conf -WP_DELETE_PLUGINS := akismet hello -WP_DELETE_THEMES := twentynineteen twentyseventeen -WP_SQL_READY := yes -WP_POST_INSTALL_TARGETS := prepare -DUMP_SQL_EXISTS := $(shell test -f $(DUMP_SQL_FILENAME) && echo yes || echo no) -SYNC_TARGETS += wp-sync-db wp-sync-files - -ifeq ($(GH_DUMP_ARTIFACT),yes) - WP_FRESH_TARGETS := gh-download-dump $(WP_FRESH_TARGETS) -endif - -PHONY += fresh -fresh: ## Build fresh development environment - @$(MAKE) $(WP_FRESH_TARGETS) - -PHONY += post-install -post-install: ## Run post-install actions - @$(MAKE) $(WP_POST_INSTALL_TARGETS) - -PHONY += set-files -set-files: - $(call step,Remove obsolete files\n) - @rm -f $(WEBROOT)/*.{txt,html} $(WEBROOT)/composer.json && printf "Files deleted.\n" - $(call step,Copy $(WP_CONF_PATH)/wp-config.php to $(WEBROOT)...\n) - $(call copy,$(WP_CONF_PATH)/wp-config.php,$(WEBROOT)/wp-config.php) - -PHONY += prepare -prepare: - $(call step,Delete inactivated plugins\n) - $(call wp,plugin delete $(WP_DELETE_PLUGINS)) - $(call step,Delete inactivated themes\n) - $(call wp,theme delete $(WP_DELETE_THEMES)) - $(call step,Replace $(WP_SYNC_SOURCE) domain with local domain\n) - $(call wp,search-replace $(WP_SYNC_SOURCE_DOMAIN) $(WP_HOSTNAME)) - $(call step,Check your site: https://$(WP_HOSTNAME)) - -PHONY += wp-sync-db -wp-sync-db: ## Sync database -ifeq ($(DUMP_SQL_EXISTS),yes) - $(call step,Import local SQL dump...\n) - $(call wp,db import $(DUMP_SQL_FILENAME)) -else - $(call step,Create database dump in $(WP_SYNC_SOURCE)...) - $(eval HOST := INSTANCE_$(WP_SYNC_SOURCE)_HOST) - $(eval USER := INSTANCE_$(WP_SYNC_SOURCE)_USER) - $(eval OPTS := INSTANCE_$(WP_SYNC_SOURCE)_OPTS) - @ssh $($(OPTS)) $($(USER))@$($(HOST)) -t "cd $(DOCKER_PROJECT_ROOT)/$(WEBROOT); wp db export $(DUMP_SQL_FILENAME); exit;" - $(call step,Download $(DUMP_SQL_FILENAME) from test server...) - @scp $($(OPTS)) $($(USER))@$($(HOST)):/var/www/html/$(WEBROOT)/$(DUMP_SQL_FILENAME) ./$(DUMP_SQL_FILENAME) - $(call step,Remove the $(DUMP_SQL_FILENAME) from $(WP_SYNC_SOURCE)...) - @ssh $($(OPTS)) $($(USER))@$($(HOST)) -t "rm $(DOCKER_PROJECT_ROOT)/$(WEBROOT)/$(DUMP_SQL_FILENAME); exit;" && echo "Removed" - $(call step,Import $(DUMP_SQL_FILENAME) to local database...) - $(call wp,db import $(DUMP_SQL_FILENAME)) -endif - -PHONY += wp-sync-files -wp-sync-files: UPLOADS := wp-content/uploads -wp-sync-files: ## Sync files - $(call step,Sync files from $(WP_SYNC_SOURCE)...\n) - $(eval HOST := INSTANCE_$(WP_SYNC_SOURCE)_HOST) - $(eval USER := INSTANCE_$(WP_SYNC_SOURCE)_USER) - $(eval OPTS := INSTANCE_$(WP_SYNC_SOURCE)_OPTS) - @rsync -av -e "ssh $($(OPTS))" $($(USER))@$($(HOST)):$(DOCKER_PROJECT_ROOT)/$(WEBROOT)/$(UPLOADS)/ $(WEBROOT)/$(UPLOADS)/ - -PHONY += wp-cache-flush -wp-cache-flush: ## Flush cache - $(call step,Flush cache) - $(call wp,cache flush) - -PHONY += wp-login -wp-login: ## Get login link - $(call wp,package install aaemnnosttv/wp-cli-login-command --quiet) - $(call wp,login install --activate --yes --quiet) - $(call wp,login create 1 --url-only) - -PHONY += wp-help -wp-help: ## Show wp-cli help - $(call wp,) - -PHONY += wp-plugins -wp-plugins: ## List plugins - $(call step,List plugins) - $(call wp,plugin list) - -define wp - $(call docker_compose_exec,wp --color --path=$(DOCKER_PROJECT_ROOT)/$(WEBROOT) $(1)) -endef - -ifeq ($(WP_SYNC_SOURCE),) - $(error WP_SYNC_SOURCE is not set. Add eg. WP_SYNC_SOURCE=prod to .env file) -endif - -ifeq ($(WP_SYNC_SOURCE_DOMAIN),) - $(error WP_SYNC_SOURCE_DOMAIN is not set. Add eg. WP_SYNC_SOURCE_DOMAIN=domain.tld to .env file) -endif From 18a439efcf5db3182e544ef6221ab017e8ad106b Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 30 Aug 2023 07:08:17 +0000 Subject: [PATCH 6/6] Update configuration --- composer.lock | 43 +++++++++++++++++++++++-------------------- tools/make/qa.mk | 10 +++++++--- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/composer.lock b/composer.lock index 65d4fde7..a59a1dea 100644 --- a/composer.lock +++ b/composer.lock @@ -3816,16 +3816,16 @@ }, { "name": "drupal/hdbt", - "version": "5.5.9", + "version": "5.5.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a" + "reference": "7e26c936b71330c788143f97cc4e2a75f53e621f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", - "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/7e26c936b71330c788143f97cc4e2a75f53e621f", + "reference": "7e26c936b71330c788143f97cc4e2a75f53e621f", "shasum": "" }, "require": { @@ -3843,10 +3843,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.10", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-28T13:26:21+00:00" + "time": "2023-08-30T07:02:24+00:00" }, { "name": "drupal/hdbt_admin", @@ -4076,16 +4076,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.6", + "version": "3.3.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa" + "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a9f447f9a9e681a73ec609423c82b4e004d2e0aa", - "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d9636698e39f86d0aa56c2771e029d0abfd1b0dc", + "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc", "shasum": "" }, "require": { @@ -4180,6 +4180,9 @@ }, "drupal/translatable_menu_link_uri": { "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch" + }, + "drupal/simple_sitemap": { + "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch" } } }, @@ -4188,10 +4191,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.6", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.7", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-29T07:11:13+00:00" + "time": "2023-08-29T11:40:56+00:00" }, { "name": "drupal/helfi_proxy", @@ -7272,16 +7275,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f" + "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/58fbd11312a8f69e0824a640b86b33a9d096fe7f", - "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", + "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", "shasum": "" }, "require": { @@ -7290,7 +7293,7 @@ "require-dev": { "composer-runtime-api": "^2.0.0", "phpstan/phpstan": "^1.2", - "phpunit/phpunit": "^9", + "phpunit/phpunit": "^9 | ^10", "sebastian/comparator": ">=4", "sebastian/diff": ">=4", "squizlabs/php_codesniffer": ">=3.6", @@ -7298,7 +7301,7 @@ "symfony/filesystem": ">=5.4", "symfony/var-dumper": ">=5.4", "symfony/yaml": ">=5.4", - "vimeo/psalm": "^4.23" + "vimeo/psalm": "^4.23 | ^5" }, "bin": [ "bin/fileeye-mimemap" @@ -7328,9 +7331,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.0.1" + "source": "https://github.com/FileEye/MimeMap/tree/2.0.2" }, - "time": "2023-02-11T19:58:58+00:00" + "time": "2023-08-29T16:20:26+00:00" }, { "name": "fileeye/pel", diff --git a/tools/make/qa.mk b/tools/make/qa.mk index 0dae5b6c..c3596a79 100644 --- a/tools/make/qa.mk +++ b/tools/make/qa.mk @@ -2,6 +2,7 @@ TEST_TARGETS += test-phpunit FIX_TARGETS := LINT_PHP_TARGETS := CS_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/phpcs && echo yes || echo no) +CS_CONF_EXISTS := $(shell test -f phpcs.xml.dist && echo yes || echo no) TESTSUITES ?= unit,kernel,functional PHONY += fix @@ -57,10 +58,13 @@ define test_result @echo "\n${YELLOW}${1}:${NO_COLOR} ${GREEN}${2}${NO_COLOR}" endef -ifeq ($(CS_INSTALLED),yes) +ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-yes) define cs -$(call docker_compose_exec,vendor/bin/$(1) --config-set installed_paths $(CS_STANDARD_PATHS)) -$(call docker_compose_exec,vendor/bin/$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2)) +$(call docker_compose_exec,$(1)) +endef +else ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-no) +define cs +$(call docker_compose_exec,$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2)) endef else define cs