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

Dev to main

.env

@@ -19,7 +19,7 @@ STAGE_FILE_PROXY_ORIGIN=
 STAGE_FILE_PROXY_ORIGIN_DIR=
 
 # Docker image
-DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.2
+DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3
 
 # Public webroot
 DRUPAL_WEBROOT=public

.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

@@ -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

@@ -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/test.yml

@@ -10,7 +10,7 @@ jobs:
   tests:
     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
       options: --hostname app
 
     services:

.github/workflows/update-config.yml

@@ -9,7 +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:
@@ -31,6 +31,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

compose.yaml

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