Skip to content

Commit 6cbba44

Browse files
authored
Merge branch 'main' into php-8.3
2 parents 8abb0d4 + 78d401b commit 6cbba44

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
node: "18"
4242

4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
- name: Build image
4646
run: bin/ci/build.sh ${{ matrix.php }} ${{ matrix.node }}
4747
- name: Test image
@@ -51,7 +51,7 @@ jobs:
5151
TEST_CMD: "vendor/bin/behat -v --profile=browser --suite=admin-ui --tags=@richtext --config=behat_ibexa_oss.yaml"
5252
PRODUCT_VERSION: ${{ matrix.product-version }}
5353
- name: Log in to the Container registry
54-
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
54+
uses: docker/login-action@v3
5555
with:
5656
registry: ghcr.io
5757
username: ${{ github.actor }}

bin/ci/test.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,22 @@ export COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/redis.yml:doc/docker/sel
7171
export APP_ENV="behat" APP_DEBUG="1"
7272
export PHP_IMAGE="ibexa_php:latest-node" PHP_IMAGE_DEV="ibexa_php:latest-node"
7373

74-
docker-compose --env-file .env up -d --build --force-recreate
74+
docker compose --env-file .env up -d --build --force-recreate
7575
echo '> Workaround for test issues: Change ownership of files inside docker container'
76-
docker-compose --env-file=.env exec -T app sh -c 'chown -R www-data:www-data /var/www'
76+
docker compose --env-file=.env exec -T app sh -c 'chown -R www-data:www-data /var/www'
7777
if docker run -i --rm ibexa_php:latest-node bash -c "php -v" | grep -q '8.3'; then
7878
echo '> Set PHP 8.2+ Ibexa error handler to avoid deprecations'
79-
docker-compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.runtime.error_handler \"\\Ibexa\\Contracts\\Core\\MVC\\Symfony\\ErrorHandler\\Php82HideDeprecationsErrorHandler\""
80-
docker-compose --env-file=.env exec -T --user www-data app sh -c "composer dump-autoload"
79+
docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.runtime.error_handler \"\\Ibexa\\Contracts\\Core\\MVC\\Symfony\\ErrorHandler\\Php82HideDeprecationsErrorHandler\""
80+
docker compose --env-file=.env exec -T --user www-data app sh -c "composer dump-autoload"
8181
fi
8282
# Rebuild Symfony container
83-
docker-compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache/*"
84-
docker-compose --env-file=.env exec -T --user www-data app php bin/console cache:clear
83+
docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache/*"
84+
docker compose --env-file=.env exec -T --user www-data app php bin/console cache:clear
8585
# Install database & generate schema
86-
docker-compose --env-file=.env exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console ibexa:install"
87-
docker-compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema"
88-
docker-compose --env-file=.env exec -T --user www-data app sh -c "composer run post-install-cmd"
86+
docker compose --env-file=.env exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console ibexa:install"
87+
docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema"
88+
docker compose --env-file=.env exec -T --user www-data app sh -c "composer run post-install-cmd"
8989

90-
docker-compose --env-file=.env exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console cache:warmup; $TEST_CMD"
90+
docker compose --env-file=.env exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console cache:warmup; $TEST_CMD"
9191

92-
docker-compose --env-file .env down -v
92+
docker compose --env-file .env down -v

0 commit comments

Comments
 (0)