Skip to content

Commit b55f9e4

Browse files
Added php8.2 to ci matrix
Signed-off-by: Bastian Schwarz <bastian@codename-php.de>
1 parent 2bc5168 commit b55f9e4

4 files changed

Lines changed: 35 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
ci:
2020
uses: codenamephp/workflows.php/.github/workflows/ci.yml@main
2121
with:
22-
php-versions: '["8.1"]'
22+
php-versions: '["8.1","8.2"]'

.idea/php.xml

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"sort-packages": true
3434
},
3535
"scripts": {
36+
"phive-update": "XDEBUG_MODE=off phive update && git add tools/* phive.xml && git commit -m 'Updated phive dependencies'",
3637
"phpunit": "XDEBUG_MODE=coverage tools/phpunit.phar -c test/phpunit.dist.xml test/",
3738
"psalm": "XDEBUG_MODE=off tools/psalm --threads=10 --long-progress",
3839
"composer-unused": "XDEBUG_MODE=off tools/composer-unused --no-progress --no-interaction",
@@ -48,6 +49,7 @@
4849
]
4950
},
5051
"scripts-descriptions": {
52+
"phive-update": "Runs a phive update and commits all tools and the phive.xml so PHPStorm won't run code formatting on the phars",
5153
"phpunit": "Runs phpunit tests",
5254
"psalm": "Runs psalm static analysis",
5355
"composer-unused": "Checks for unused composer packages",

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.6'
22

33
services:
44
application:
5-
user: "${UID}:${GID}" #don't run as root by default to prevent permission conflicts
5+
user: "${UID:-1000}:${GID:-1000}" #don't run as root by default to prevent permission conflicts
66
build:
77
context: docker/application
88
args:
@@ -12,6 +12,7 @@ services:
1212
- ./:/app
1313
- $HOME/.phive:/home/application/.phive
1414
- $HOME/.ssh:/home/application/.ssh
15+
- $HOME/.gitconfig:/home/application/.gitconfig
1516
- ${SSH_AUTH_SOCK:-/ssh-agent}:/ssh-agent # Forward local machine SSH key to docker
1617
- /etc/timezone:/etc/timezone:ro
1718
- /etc/localtime:/etc/localtime:ro

0 commit comments

Comments
 (0)