Skip to content

chore: prepare CI for PHP version matrix testing #816

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.

Sign up for GitHub

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

Open
anonymoususer72041 wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −4
Open

chore: prepare CI for PHP version matrix testing #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
827b6b2
Make the Docker PHP image version configurable
anonymoususer72041 Jun 24, 2026
643684a
Use the PHP matrix version for Docker tests
anonymoususer72041 Jun 24, 2026
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.composer/cache
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-php-
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-${{ matrix.php-version }}-
${{ runner.os }}-php-

- name: Install Dependencies
run: composer install --no-progress --prefer-dist
Expand All @@ -61,7 +63,7 @@ jobs:
touch ./INSTALL_BLOCK

cd docker/
docker compose -f docker-compose-test.yml up -d
PHP_VERSION=${{ matrix.php-version }} docker compose -f docker-compose-test.yml up -d --build

echo "Waiting for BOTH databases..."
opencatsdb_container="$(docker compose -f docker-compose-test.yml ps -q opencatsdb)"
Expand Down
2 changes: 2 additions & 0 deletions docker/docker-compose-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ services:
build:
context: ..
dockerfile: docker/php/Dockerfile
args:
PHP_VERSION: ${PHP_VERSION:-7.4}
working_dir: /var/www/public
volumes_from:
- opencatsdata
Expand Down
3 changes: 2 additions & 1 deletion docker/php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM php:7.4-fpm-alpine
ARG PHP_VERSION=7.4
FROM php:${PHP_VERSION}-fpm-alpine

# Runtime/system packages required by OpenCATS and helper tools.
RUN apk add --no-cache \
Expand Down
Loading