Merge pull request #54 from City-of-Helsinki/dev

Release 27.09.2022 dev -> main
City-of-Helsinki · Sep 27, 2022 · e66eab7 · e66eab7
2 parents 7f5f93e + 609a6dc
commit e66eab7
Show file tree

Hide file tree

Showing 367 changed files with 14,006 additions and 774 deletions.
diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -41,6 +41,7 @@ jobs:
           $(drush sql:connect) < latest.sql
           drush cr && drush cim -y
           composer update drupal/helfi_* drupal/hdbt* -W
+          drush cr
           drush updb -y
           drush cex -y
           # Update platform

diff --git a/composer.json b/composer.json
@@ -7,20 +7,21 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "composer/installers": "^1.9",
+        "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.7",
         "drupal/core-composer-scaffold": "~9.4.5",
         "drupal/core-recommended": "~9.4.5",
-        "drupal/hdbt": "^3.0",
+        "drupal/hdbt": "^4.0",
         "drupal/hdbt_admin": "^1.0",
-        "drupal/helfi_ahjo": "^1.0",
         "drupal/helfi_azure_fs": "^1.0",
         "drupal/helfi_drupal_tools": "dev-main",
-        "drupal/helfi_hauki": "^1.0",
+        "drupal/helfi_navigation": "^1.0",
         "drupal/helfi_platform_config": "^2.0",
-        "drupal/helfi_proxy": "^2.2",
+        "drupal/helfi_proxy": "^2.0",
         "drupal/helfi_tpr": "^2.0",
         "drupal/helfi_tunnistamo": "^2.0",
+        "drupal/redis": "^1.5",
+        "drupal/stage_file_proxy": "^1.2",
         "drush/drush": "^10.4 || ^11"
     },
     "require-dev": {