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

Dev to main

.gitattributes

@@ -42,6 +42,9 @@
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."

.github/pull_request_template.md

@@ -19,11 +19,16 @@
 * [ ] Check that this feature works
 * [ ] Check that code follows our standards
 
-## Designers review
+## Continuous documentation
 <!-- One of the checkboxes below needs to be checked like this: `[x]` (or click when not in edit mode) -->
 
-* [ ] This PR does not need designers review
-* [ ] This PR has been visually reviewed by a designer (Name of the designer)
+* [ ] This feature has been documented/the documentation has been updated
+* [ ] This change doesn't require updates to the documentation
+
+## Translations
+<!-- The checkbox below needs to be checked like this: `[x]` (or click when not in edit mode). Not needed if the translations were not affected. -->
+
+* [ ] Translations have been added to .po -files and included in this PR
 
 ## Other PRs
 <!-- For example an related PR in another repository -->

.github/workflows/artifact.yml.dist → .github/workflows/artifact.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
+      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
 
     services:
       db:

.github/workflows/auto-release-pr.yml.dist → .github/workflows/auto-release-pr.yml

@@ -7,9 +7,7 @@ jobs:
   release-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
+      - uses: actions/checkout@v4
       - name: Create pull request
         run: |
           gh pr create \

.github/workflows/npm-audit.yml

@@ -0,0 +1,69 @@
+name: Npm audit
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 12 * * 0'  # Run every fortnight on Sunday at 12
+
+jobs:
+  npm_audit:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run npm audit
+        id: npm_audit
+        run: |
+          find public/modules/custom public/themes/custom -type f -name ".nvmrc" -exec sh -c '
+            dir=$(dirname "$1")
+            node_version=$(cat "$1")
+            echo "Using Node.js version $node_version in $dir"
+            cd "$dir"
+            export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+            nvm install $node_version
+            nvm use $node_version
+            set +e
+            npm audit --package-lock-only --loglevel=error;
+            # The npm audit command will exit with a 0 exit code if no vulnerabilities were found.
+            if [ $? -gt 0 ]; then
+              npm audit fix --package-lock-only --loglevel=error;
+              if [ $? -gt 0 ]; then
+                echo "BC_BREAK=:exclamation: NPM Audit fix could not fix all vulnerabilities. Fix them manually by running \`npm audit fix --force\` and test the functionalities thoroughly as there might be breaking changes. :exclamation:" >> $GITHUB_ENV;
+              fi;
+              echo "CREATE_PR=true" >> $GITHUB_OUTPUT;
+            fi;
+            set -e
+          ' sh {} \;
+
+
+      - name: Create Pull Request
+        if: steps.npm_audit.outputs.CREATE_PR == 'true'
+        uses: peter-evans/create-pull-request@v4
+        with:
+          committer: GitHub <[email protected]>
+          author: actions-bot <[email protected]>
+          commit-message: Updated node modules based on npm audit fix
+          title: Automatic npm audit fix
+          labels: auto-update
+          body: |
+            # Npm audit
+
+            ${{ env.BC_BREAK }}
+
+            ## How to install
+
+            * Update the HDBT theme
+               * `git fetch --all`
+               * `git checkout automation/npm-audit`
+               * `git pull origin automation/npm-audit`
+            * In the custom module or custom theme folder, run `nvm use && npm i && npm run build`
+
+            ## How to test
+            Run `npm audit`
+
+            * [ ] Check that the `npm audit` prints `found 0 vulnerabilities`
+            * [ ] Check that the changes for distributed files are sensible
+
+          branch: automation/npm-audit

.github/workflows/test.yml.dist

@@ -10,7 +10,7 @@ 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.3-alpine
       options: --hostname app
 
     services:
@@ -23,7 +23,6 @@ jobs:
           MYSQL_ROOT_PASSWORD: drupal
         ports:
           - 3306:3306
-
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/update-config.yml.dist → .github/workflows/update-config.yml

@@ -9,8 +9,7 @@ jobs:
   update-config:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
-
+      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
     services:
       db:
         image: mysql:8
@@ -31,6 +30,12 @@ jobs:
         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
@@ -44,10 +49,6 @@ jobs:
           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

.gitignore

@@ -8,12 +8,15 @@ public/modules/contrib
 public/themes/contrib
 public/sites/default/files
 vendor
-helfi-test-automation-python/
 public/sites/simpletest/
+public/sites/backstop/
 
 # Ignore the folder created by PhpStorm
 .idea/*
+
+# Ignore local settings
 public/sites/default/local.settings.php
+public/sites/default/local.services.yml
 
 *.sql
 *.env.local

azure-pipelines-test.yml

@@ -3,7 +3,7 @@
 trigger:
   branches:
     include:
-      - develop
+      - dev
   paths:
     exclude:
       - README.md

compose.yaml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   app:
     container_name: "${COMPOSE_PROJECT_NAME}-app"