Skip to content
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
14 changes: 2 additions & 12 deletions .github/workflows/php.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
os:
- 'ubuntu-22.04'
php:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
Expand All @@ -33,18 +32,9 @@ jobs:
- '~7.1.0'
include:
- os: 'windows-2022'
php: '8.1'
php: '8.2'
dependencies: 'highest'
symfony_version: '~6.4.0'
exclude:
- os: 'ubuntu-22.04'
php: '8.1'
dependencies: 'lowest'
symfony_version: '~7.1.0'
- os: 'ubuntu-22.04'
php: '8.1'
dependencies: 'highest'
symfony_version: '~7.1.0'
runs-on: ${{ matrix.os }}

steps:
Expand Down Expand Up @@ -77,7 +67,7 @@ jobs:
strategy:
matrix:
include:
- php: '8.1'
- php: '8.2'
symfony_version: '~6.4.0'
dependencies: 'highest'
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sh-php:
docker compose exec --user=www-data php81 sh
docker compose exec --user=www-data php82 sh
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}
],
"require": {
"php": ">=8.1",
"php": ">=8.2",
"composer-runtime-api": "^2.0",
"dragonmantank/cron-expression": "^3.4.0",
"laravel/serializable-closure": "^2.0",
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
php81:
php82:
build:
context: ./docker/php81
context: ./docker/php82
working_dir: /var/www/html
environment:
CRUNZ_CONTAINER_DEBUG: 1
Expand All @@ -14,5 +14,5 @@ services:
"
volumes:
- .:/var/www/html
- ./docker/php81/php.ini:/usr/local/etc/php/php.ini:ro
- ./docker/php82/php.ini:/usr/local/etc/php/php.ini:ro
stop_grace_period: 1s
4 changes: 2 additions & 2 deletions docker/php81/Dockerfile → docker/php82/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1.30-cli-alpine
FROM php:8.2.30-cli-alpine

RUN apk add --no-cache \
shadow \
Expand All @@ -18,5 +18,5 @@ RUN mkdir -p \
/var/log/php/error.log \
/var/www/.composer

COPY --from=composer/composer:2.8.2-bin /composer /usr/bin/composer
COPY --from=composer/composer:2.9.3-bin /composer /usr/bin/composer
ENV COMPOSER_HOME /var/www/.composer
File renamed without changes.