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

Dev to main
City-of-Helsinki · Apr 5, 2023 · cc8afb0 · cc8afb0
2 parents 4e5f905 + ebaeb85
commit cc8afb0
Show file tree

Hide file tree

Showing 315 changed files with 4,519 additions and 12,820 deletions.
diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml
@@ -18,7 +18,7 @@ jobs:
 
     services:
       db:
-        image: mariadb:10.7
+        image: mariadb
         env:
           MYSQL_USER: drupal
           MYSQL_PASSWORD: drupal

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,4 +1,7 @@
-on: [push]
+on:
+  pull_request:
+  push:
+    branches: ['main', 'dev']
 name: CI
 env:
   SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
@@ -13,7 +16,7 @@ jobs:
 
     services:
       db:
-        image: mariadb:10.9
+        image: mariadb
         env:
           MYSQL_USER: drupal
           MYSQL_PASSWORD: drupal
@@ -30,6 +33,9 @@ jobs:
       - name: Build project
         run: composer install
 
+      - name: Scan security updates
+        run: drush pm:security
+
       - name: Check that subtheme is not built with dev mode
         run: if grep -q 'sourceMappingURL=' -R public/themes/custom/hdbt_subtheme/dist/css; then exit 1; fi
 
@@ -46,7 +52,7 @@ jobs:
       - name: Install Drupal
         run: |
           mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql
-          drush cr && drush cim -y
+          drush deploy
 
       - name: Start services
         run: |

diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -15,7 +15,7 @@ jobs:
 
     services:
       db:
-        image: mariadb:10.7
+        image: mariadb
         env:
           MYSQL_USER: drupal
           MYSQL_PASSWORD: drupal
@@ -39,7 +39,7 @@ jobs:
         run: |
           composer install
           $(drush sql:connect) < latest.sql
-          drush cr && drush cim -y
+          drush deploy
           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,24 +7,25 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "composer/installers": "^1.9",
+        "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.7",
         "drupal/core": "^9.4",
         "drupal/core-composer-scaffold": "^9.4",
         "drupal/disable_field": "^3.0",
-        "drupal/hdbt": "^4.0",
-        "drupal/hdbt_admin": "^1.0",
+        "drupal/hdbt": "^5.0",
+        "drupal/hdbt_admin": "^2.0",
         "drupal/helfi_azure_fs": "^1.1",
         "drupal/helfi_drupal_tools": "dev-main",
         "drupal/helfi_navigation": "^2.0",
-        "drupal/helfi_platform_config": "^2.0",
+        "drupal/helfi_platform_config": "^3.0",
         "drupal/helfi_proxy": "^3.0",
         "drupal/helfi_tpr": "^2.0",
         "drupal/helfi_tunnistamo": "^2.0",
         "drupal/migrate_plus": "^6.0",
         "drupal/raven": "^4.0",
+        "drupal/redis": "^1.5",
         "drupal/stage_file_proxy": "^1.2",
-        "drush/drush": "^10.4 || ^11"
+        "drush/drush": "^11"
     },
     "require-dev": {
         "donatj/mock-webserver": "^2.4",