Dev to main

.dockerignore

@@ -0,0 +1,4 @@
+.git/
+.github/
+.idea/
+*.sql

.env

@@ -9,7 +9,7 @@ COMPOSE_PROJECT_NAME=hel-fi-drupal-grant-applications
 DRUPAL_HOSTNAME=hel-fi-drupal-grant-applications.docker.so
 
 # Docker image
-DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.2
+DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3
 
 # Default source @alias where to sync database and files from
 DRUPAL_SYNC_SOURCE=main

.github/dependabot.yml.dist

@@ -0,0 +1,18 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+version: 2
+updates:
+  - package-ecosystem: "composer" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    allow:
+      # Update only direct dependencies. This reduces spam since most
+      # indirect dependencies are handles by update-config workflow.
+      - dependency-type: "direct"
+    ignore:
+      # Updated by update-config workflow
+      - dependency-name: "drupal/helfi_*"
+      - dependency-name: "drupal/hdbt*"
+      # Updated separately
+      - dependency-name: "drupal/core*"

.github/workflows/artifact.yml

@@ -7,37 +7,4 @@ on:
 name: Build artifacts
 jobs:
   build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
-
-    services:
-      db:
-        image: mysql:8
-        env:
-          MYSQL_USER: drupal
-          MYSQL_PASSWORD: drupal
-          MYSQL_DATABASE: drupal
-          MYSQL_ROOT_PASSWORD: drupal
-        ports:
-          - 3306:3306
-
-    steps:
-      - 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 sql-dump --result-file=${GITHUB_WORKSPACE}/latest.sql
-
-      - name: Upload latest database dump
-        uses: actions/upload-artifact@v4
-        with:
-          name: latest.sql
-          path: latest.sql
-          retention-days: 10
+    uses: city-of-helsinki/drupal-gh-actions/.github/workflows/build-artifact.yml@main

.github/workflows/test.yml

@@ -3,87 +3,8 @@ on:
   push:
     branches: ['main', 'dev']
 name: CI
-env:
-  SYMFONY_DEPRECATIONS_HELPER: disabled
-  SIMPLETEST_BASE_URL: http://app:8888
 jobs:
   tests:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
-      options: --hostname app
-
-    services:
-      db:
-        image: mysql:8
-        env:
-          MYSQL_USER: drupal
-          MYSQL_PASSWORD: drupal
-          MYSQL_DATABASE: drupal
-          MYSQL_ROOT_PASSWORD: drupal
-        ports:
-          - 3306:3306
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set browsertest output folder
-        run: |
-          echo "BROWSERTEST_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/public/sites/simpletest" >> $GITHUB_ENV
-
-      # TODO this does not pass
-      #- 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
-
-      - name: Scan security updates
-        run: composer audit
-
-      - 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
-
-      - name: Run PHPCS
-        run: |
-          vendor/bin/phpcs public/modules/custom/
-          vendor/bin/phpcs public/themes/custom/
-
-      - name: Run phpstan
-        run: vendor/bin/phpstan analyze
-
-      - name: Download latest dump
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh run download -n latest.sql
-
-      - name: Install Drupal
-        run: |
-          mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql
-          drush deploy
-
-      - name: Start services
-        run: |
-          drush runserver $SIMPLETEST_BASE_URL --dns > /dev/null 2>&1 &
-
-          # Wait for drush server to start.
-          for i in {1..5}; do RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" "$SIMPLETEST_BASE_URL" || true); if [ "$RESPONSE_CODE" -gt "301" ] || [ "$RESPONSE_CODE" -lt "200" ]; then sleep 2; fi; done
-
-      - name: Run PHPUnit tests
-        run: |
-          composer test-php public/modules/custom
-          if [ -d "tests/" ]; then composer test-php tests/; else echo "No DTT tests found. Ignoring..."; fi
-
-      - name: Create an artifact from test report
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: results
-          path: ${{ env.BROWSERTEST_OUTPUT_DIRECTORY }}
-          retention-days: 1
+    uses: city-of-helsinki/drupal-gh-actions/.github/workflows/project-tests.yml@main
+    with:
+      check_config_language: false

.github/workflows/update-config.yml

@@ -3,105 +3,8 @@ on:
   repository_dispatch:
     types: [config_change]
 name: Update config
-env:
-  GH_TOKEN: ${{ github.token }}
 jobs:
   update-config:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
-    services:
-      db:
-        image: mysql:8
-        env:
-          MYSQL_USER: drupal
-          MYSQL_PASSWORD: drupal
-          MYSQL_DATABASE: drupal
-          MYSQL_ROOT_PASSWORD: drupal
-        ports:
-          - 3306:3306
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Check if required secrets are set
-        env:
-          AUTOMATIC_UPDATE_TOKEN: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
-        if: env.AUTOMATIC_UPDATE_TOKEN == ''
-        run: exit 1
-
-      - name: Download latest dump
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh run download -n latest.sql
-
-      - name: Prepare setup
-        run: |
-          # We install Drupal from existing dump, so locale_install() hook
-          # is never fired. Make sure the translations folder exists.
-          mkdir -p public/sites/default/files/translations -p
-
-      - name: Build project
-        run: |
-          composer install --no-interaction
-          $(drush sql:connect) < latest.sql
-          drush cim -y && drush updb -y && drush cr
-          composer update drupal/helfi_* drupal/hdbt* -W --no-interaction
-          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
-
-      - name: Check module versions
-        id: module-status
-        run: |
-          MODE="delete"
-          drush helfi:tools:check-composer-versions $GITHUB_WORKSPACE/composer.lock --format=markdown_table >> $GITHUB_STEP_SUMMARY && EXIT_CODE=$? || EXIT_CODE=$?
-          if [ "$EXIT_CODE" -eq 3 ]; then
-            MODE="upsert"
-            echo "  " >> $GITHUB_STEP_SUMMARY
-            echo ":warning: Failed to install the latest version of the packages listed above" >> $GITHUB_STEP_SUMMARY
-            echo "  " >> $GITHUB_STEP_SUMMARY
-            echo "Please run \`composer why-not drupal/package_name package_version\` to see why." >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "MODE=$MODE" >> $GITHUB_OUTPUT
-          cat $GITHUB_STEP_SUMMARY > /tmp/pr-message.txt
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: Update configuration
-          token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
-          title: Automatic update
-          labels: auto-update
-          body: |
-            - Updated active configuration.
-            - Updated platform
-          branch: update-configuration
-
-      - name: Attempt to find PR
-        env:
-          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-        id: find-pr
-        run: echo "number=$(gh pr list --base ${BRANCH_NAME} --head update-configuration --json number --jq '.[].number')" >> $GITHUB_OUTPUT
-
-      - name: Comment PR
-        uses: thollander/actions-comment-pull-request@v2
-        if: ${{ steps.find-pr.outputs.number != '' }}
-        with:
-          comment_tag: status
-          mode: ${{ steps.module-status.outputs.MODE }}
-          filePath: /tmp/pr-message.txt
-          pr_number: ${{ steps.find-pr.outputs.number }}
+    uses: city-of-helsinki/drupal-gh-actions/.github/workflows/update-config.yml@main
+    secrets:
+      automatic_update_token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}

.platform/schema

@@ -1 +1 @@
-10
+14

compose.ci.yaml

@@ -0,0 +1,6 @@
+services:
+  app:
+    user: "1001:1001"
+    environment:
+      SYMFONY_DEPRECATIONS_HELPER: disabled
+      BROWSERTEST_OUTPUT_DIRECTORY: /app/results

compose.yaml

@@ -8,6 +8,7 @@ services:
     depends_on:
       - db
     environment:
+      WEBROOT: /app/public
       STAGE_FILE_PROXY_ORIGIN: "${STAGE_FILE_PROXY_ORIGIN}"
       STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}"
       APP_ENV: "${APP_ENV:-local}"
@@ -87,6 +88,8 @@ services:
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true"
       - "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081"
       - "traefik.docker.network=stonehenge-network"
+    profiles:
+      - varnish
   elastic-proxy:
     container_name: "${COMPOSE_PROJECT_NAME}-elastic-proxy"
     image: nginxinc/nginx-unprivileged:alpine-perl
@@ -116,7 +119,7 @@ services:
     profiles:
       - search
   elastic:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.4.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
     container_name: "${COMPOSE_PROJECT_NAME}-elastic"
     environment:
       - node.name="${COMPOSE_PROJECT_NAME}-elastic"
@@ -151,23 +154,30 @@ services:
       - search
   artemis:
     container_name: "${COMPOSE_PROJECT_NAME}-artemis"
-    image: quay.io/artemiscloud/activemq-artemis-broker
-    environment:
-      AMQ_EXTRA_ARGS: "--user admin --password admin"
+    image: apache/activemq-artemis
     depends_on:
       - app
     networks:
       - internal
+      - stonehenge-network
     profiles:
       - queue
   chromium:
-    # @todo Update this to newer version once minkphp supports Selenium 4.
-    # @see https://github.com/minkphp/MinkSelenium2Driver/pull/372
-    image: seleniarm/standalone-chromium:106.0
+    image: selenium/standalone-chromium
+    environment:
+      SE_NODE_OVERRIDE_MAX_SESSIONS: "true"
+      SE_NODE_MAX_SESSIONS: "16"
+      SE_START_XVFB: "false"
+      SE_START_VNC: "false"
+      SE_SESSION_RETRY_INTERVAL: "1"
+      SE_SESSION_REQUEST_TIMEOUT: "10"
+    depends_on:
+      - app
     networks:
       - internal
     profiles:
       - testing
+
 networks:
   internal:
     external: false

composer.json

@@ -76,16 +76,11 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+        "dg/bypass-finals": "^1.5",
         "donatj/mock-webserver": "^2.4",
-        "drupal/coder": "^8.3",
-        "drupal/core-dev": "^10.2.4",
+        "drupal/core-dev": "^10",
         "jangregor/phpstan-prophecy": "^1.0",
-        "mglaman/phpstan-drupal": "^1.2",
-        "phpspec/prophecy-phpunit": "^2",
-        "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpunit/phpunit": "^9.5",
         "weitzman/drupal-test-traits": "^2.0"
     },
     "conflict": {
@@ -95,13 +90,14 @@
         "optimize-autoloader": true,
         "sort-packages": true,
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
             "composer/installers": true,
             "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-composer-scaffold": true,
-            "phpstan/extension-installer": true,
             "oomphinc/composer-installers-extender": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "phpstan/extension-installer": true,
+            "tbachert/spi": false
         },
         "audit": {
             "abandoned": "report",
@@ -122,9 +118,6 @@
             "drupal/autologout": {
                 "Modal related issues": "https://www.drupal.org/files/issues/2023-04-25/autologout.2023-04-25.patch"
             },
-            "drupal/search_api": {
-                "Primary key fix": "patches/search_api_primary_key.patch"
-            },
             "drupal/crop": {
                 "Fix encoded paths for files": "patches/AU-2225-fix-encoded-paths.patch"
             }