Dev to main

.github/workflows/artifact.yml

@@ -23,20 +23,20 @@ jobs:
           - 3306:3306
 
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
+      - uses: actions/checkout@v4
 
       - name: Build project
         run: composer install --no-interaction
 
       - name: Setup drupal and save database dump
         run: |
-          drush si -y && drush cr && drush si --existing-config -y && drush cim -y
+          drush si -y && drush cr
+          drush si --existing-config -y
+          drush cim -y
           drush sql-dump --result-file=${GITHUB_WORKSPACE}/latest.sql
 
       - name: Upload latest database dump
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: latest.sql
           path: latest.sql

.github/workflows/test.yml

@@ -25,9 +25,17 @@ jobs:
           - 3306:3306
 
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
+      - uses: actions/checkout@v4
+
+      - name: Make sure configuration was exported in correct language (en or und)
+        run: |
+          OUTPUT=$(grep -oP '^langcode: \b(?!(?:en|und)\b)\w+' conf -R || true)
+
+          if [ ! -z "$OUTPUT" ]; then
+            echo "Found configuration that does not match the pattern 'langcode: (en|und)':" >> $GITHUB_STEP_SUMMARY
+            echo "$OUTPUT" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
 
       - name: Build project
         run: composer install --no-interaction

.github/workflows/update-config.yml

@@ -24,6 +24,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
       - name: Download latest dump
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -36,7 +37,19 @@ jobs:
           $(drush sql:connect) < latest.sql
           drush cim -y && drush updb -y && drush cr
           composer update drupal/helfi_* drupal/hdbt* -W --no-interaction
-          drush cr && drush updb -y && drush cex -y
+          drush cr
+
+          # Update translations from localize.drupal.org and helfi-modules
+          # before running update hooks to reduce clutter in configuration files.
+          drush locale:check && drush locale:update
+          drush updb -y
+
+          # Update translations from helfi_platform_config. These translations
+          # consists of overrides for non customised translations and will
+          # override current translation with a non customised translation.
+          drush helfi:locale-import helfi_platform_config
+          drush cex -y
+
           # Update platform
           drush helfi:tools:update-platform
 

.platform/schema

@@ -1 +1 @@
-5
+6

docker-compose.yml → compose.yaml

@@ -14,7 +14,7 @@ services:
       STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}"
       APP_ENV: "${APP_ENV:-local}"
       ELASTIC_PROXY_URL: ${ELASTIC_PROXY_URL:-""}
-      DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://${COMPOSE_PROJECT_NAME}-varnish"
+      DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://${COMPOSE_PROJECT_NAME}-varnish,http://${COMPOSE_PROJECT_NAME}"
       DRUPAL_REVERSE_PROXY_ADDRESS: helfi-proxy.docker.so
       DRUSH_OPTIONS_URI: "https://${DRUPAL_HOSTNAME}"
       # To enable xdebug, run `export XDEBUG_ENABLE=true` before (re)starting your project.
@@ -27,7 +27,6 @@ services:
       # Use drush server to run functional tests, so we don't have to care about
       # permission or SSL issues.
       SIMPLETEST_BASE_URL: "http://app:8888"
-      SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
       BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
       BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest"
       DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"