Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added php 8.3 documentation #28

Merged
merged 6 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/php-ci.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/php-openshift.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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`

Expand All @@ -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`

Expand Down
11 changes: 7 additions & 4 deletions ci/drupal/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
36 changes: 0 additions & 36 deletions ci/robo/Dockerfile

This file was deleted.

19 changes: 0 additions & 19 deletions ci/robo/Makefile

This file was deleted.

24 changes: 0 additions & 24 deletions ci/robo/README.md

This file was deleted.

3 changes: 2 additions & 1 deletion local/drupal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
4 changes: 3 additions & 1 deletion openshift/drupal/README.md
Original file line number Diff line number Diff line change
@@ -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`
Expand Down