Skip to content

Commit

Permalink
update php to 8.3 and mariadb to latest patch version 10.11.10
Browse files Browse the repository at this point in the history
  • Loading branch information
lukadschaak committed Nov 19, 2024
1 parent ff08333 commit 18be228
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: PHP Setup
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3

- name: Validate composer.json
run: composer validate --ansi --strict
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,21 @@ jobs:
- php-version: "8.2"
dependencies: "highest"
phpunit-flags: "--fail-on-risky"
- php-version: "8.3"
dependencies: "highest"
phpunit-flags: "--fail-on-risky"

env:
MYSQL_HOST: 127.0.0.1
MYSQL_PORT: 3306
MYSQL_USER: root
MYSQL_PASSWORD: pimcore
MYSQL_DATABASE: pimcore
MYSQL_SERVER_VERSION: "10.11.5-MariaDB"
MYSQL_SERVER_VERSION: "10.11.10-MariaDB"

services:
mariadb:
image: mariadb:10.11.5
image: mariadb:10.11.10
env:
MYSQL_ROOT_PASSWORD: pimcore
options: >-
Expand Down
6 changes: 3 additions & 3 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
database:
image: mariadb:10.11.4
image: mariadb:10.11.10
command: [ "mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci" ]
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: yes
Expand All @@ -16,11 +16,11 @@ services:
timeout: 10s

php:
image: pimcore/pimcore:php8.2-latest
image: pimcore/pimcore:php8.3-latest
volumes:
- ./:/var/www/html/
environment:
MYSQL_SERVER_VERSION: mariadb-10.11.4
MYSQL_SERVER_VERSION: mariadb-10.11.10
depends_on:
database:
condition: service_healthy
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
],
"require": {
"php": "~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"doctrine/persistence": "^2.2 || ^3.0",
"phpunit/phpunit": "^9.6.0",
"pimcore/pimcore": "^10.5 || ~11.0.0 || ~11.1.0 || ~11.2.2 || ~11.3.0 || ~11.4.0",
Expand Down

0 comments on commit 18be228

Please sign in to comment.