Merge pull request #28 from City-of-Helsinki/UHF-9564

Added php 8.3 documentation
City-of-Helsinki · Apr 4, 2024 · 0efc7b2 · 0efc7b2
2 parents d4aa6a4 + 69f05de
commit 0efc7b2
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 88 deletions.
diff --git a/.github/workflows/php-ci.yml b/.github/workflows/php-ci.yml
@@ -1,11 +1,13 @@
 on:
   pull_request:
     paths:
+      - '!**.md'
       - 'ci/drupal/**'
       - '.github/workflows/php-ci.yml'
   push:
     branches: [ main ]
     paths:
+      - '!**.md'
       - 'ci/drupal/**'
       - '.github/workflows/php-ci.yml'
 jobs:

diff --git a/.github/workflows/php-openshift.yml b/.github/workflows/php-openshift.yml
@@ -1,11 +1,13 @@
 on:
   pull_request:
     paths:
+      - '!**.md'
       - 'openshift/drupal/**'
       - '.github/workflows/php-openshift.yml'
   push:
     branches: [ main ]
     paths:
+      - '!**.md'
       - 'openshift/drupal/**'
       - '.github/workflows/php-openshift.yml'
 jobs:

diff --git a/README.md b/README.md
@@ -14,8 +14,9 @@ See:
 - [City-of-Helsinki/drupal-helfi-platform/documentation/openshift.md](https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/documentation/openshift.md) for documentation on how to use this image in your own project.
 - [openshift/drupal/README.md](openshift/drupal/README.md) for developer documentation.
 
-Available PHP versions: `8.2`, `8.1`:
+Available PHP versions: `8.3`, `8.2`, `8.1`:
 
+- `ghcr.io/city-of-helsinki/drupal-docker-base:8.3`
 - `ghcr.io/city-of-helsinki/drupal-docker-base:8.2`
 - `ghcr.io/city-of-helsinki/drupal-docker-base:8.1`
 
@@ -25,8 +26,9 @@ Based on [druidfi/drupal-web](https://github.com/druidfi/docker-images) with som
 
 See [local/drupal/README.md](local/drupal/README.md) for documentation.
 
-Available PHP versions: `8.2`, `8.1`:
+Available PHP versions: `8.3`, `8.2`, `8.1`:
 
+- `ghcr.io/city-of-helsinki/drupal-web:8.3`
 - `ghcr.io/city-of-helsinki/drupal-web:8.2`
 - `ghcr.io/city-of-helsinki/drupal-web:8.1`
 
@@ -37,8 +39,9 @@ Contains Docker images for testing Drupal.
 See:
 - [ci/drupal](ci/drupal) for more documentation about Drupal CI image.
 
-Available PHP versions: `8.2`, `8.1`:
+Available PHP versions: `8.3`, `8.2`, `8.1`:
 
+- `ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine`
 - `ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine`
 - `ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine`
 

diff --git a/ci/drupal/README.md b/ci/drupal/README.md
@@ -1,21 +1,24 @@
 # Drupal CI image
 
-Available PHP versions: `8.2`, `8.1`:
+Available PHP versions: `8.3`, `8.2`, `8.1`:
 
+- `ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine`
 - `ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine`
 - `ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine`
 
-All images should include all packages necessary to run all Drupal tests (including FunctionalJavascript tests using `chromium-driver`).
+All images should include all packages necessary to run all Drupal tests.
 
-See [test.yml](https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/.github/workflows/test.yml.dist) for an example how to run tests using this image.
+See:
+- [test.yml](https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/.github/workflows/test.yml.dist) for an example how to run tests using this image.
+- [Automated testing documentation](https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/documentation/testing.md)
 
 ## Environment variables
 
 - `SIMPLETEST_DB=mysql://drupal:drupal@db:3306/drupal`
 - `SIMPLETEST_BASE_URL=http://127.0.0.1:8888`
 - `COMPOSER_HOME=/tmp/.composer`: The composer home is overridden to mitigate permission issues
-- `DRUSH_SECURITY_ADVISORIES_URL`: This is used by `drush pm:security` command to scan project for security updates
 - `COMPOSER_MIRROR_PATH_REPOS=1`: Individual module tests use `composer config repositories N $GITHUB_WORKSPACE && composer require drupal/$MODULE_NAME` to symlink module's codebase from $GITHUB_WORKSPACE to public/modules/contrib folder. PHPUnit seems to sometimes report an incorrect test coverage if the test folder is a symlink. This setting changes composer to mirror the content instead of symlinking it. See https://helsinkisolutionoffice.atlassian.net/browse/UHF-8566
+- `COMPOSER_DISCARD_CHANGES=true`: Automatically discard uncommitted changes
 
 ## Development
 

diff --git a/ci/robo/Dockerfile b/ci/robo/Dockerfile
diff --git a/ci/robo/Makefile b/ci/robo/Makefile
diff --git a/ci/robo/README.md b/ci/robo/README.md
diff --git a/local/drupal/README.md b/local/drupal/README.md
@@ -6,8 +6,9 @@ Based on [druidfi/drupal-web](https://github.com/druidfi/docker-images) with few
 - Force HTTPS nginx fastcgi parameter `on` to make sure Drupal generates URLs using `https`
 - Run php-fpm and nginx as same user to prevent some weird permission issues
 
-Available PHP versions: `8.2`, `8.1`:
+Available PHP versions: `8.3`, `8.2`, `8.1`:
 
+- `ghcr.io/city-of-helsinki/drupal-web:8.3`
 - `ghcr.io/city-of-helsinki/drupal-web:8.2`
 - `ghcr.io/city-of-helsinki/drupal-web:8.1`
 

diff --git a/openshift/drupal/README.md b/openshift/drupal/README.md
@@ -1,7 +1,9 @@
 # OpenShift Drupal base images
 
-Supported PHP versions: `8.2`, `8.1`:
+Supported PHP versions: `8.3`, `8.2`, `8.1`:
 
+- `ghcr.io/city-of-helsinki/drupal-docker-base:8.3-dev`
+- `ghcr.io/city-of-helsinki/drupal-docker-base:8.3`
 - `ghcr.io/city-of-helsinki/drupal-docker-base:8.2-dev`
 - `ghcr.io/city-of-helsinki/drupal-docker-base:8.2`
 - `ghcr.io/city-of-helsinki/drupal-docker-base:8.1-dev`