Merge branch 'main' into php-8.3

ibexa · May 14, 2024 · 6cbba44 · 6cbba44
2 parents 8abb0d4 + 78d401b
commit 6cbba44
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -41,7 +41,7 @@ jobs:
                       node: "18"
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - name: Build image
               run: bin/ci/build.sh ${{ matrix.php }} ${{ matrix.node }}
             - name: Test image
@@ -51,7 +51,7 @@ jobs:
                 TEST_CMD: "vendor/bin/behat -v --profile=browser --suite=admin-ui --tags=@richtext --config=behat_ibexa_oss.yaml"
                 PRODUCT_VERSION: ${{ matrix.product-version }}
             - name: Log in to the Container registry
-              uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+              uses: docker/login-action@v3
               with:
                 registry: ghcr.io
                 username: ${{ github.actor }}

diff --git a/bin/ci/test.sh b/bin/ci/test.sh
@@ -71,22 +71,22 @@ export COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/redis.yml:doc/docker/sel
 export APP_ENV="behat" APP_DEBUG="1"
 export PHP_IMAGE="ibexa_php:latest-node" PHP_IMAGE_DEV="ibexa_php:latest-node"
 
-docker-compose --env-file .env up -d --build --force-recreate
+docker compose --env-file .env up -d --build --force-recreate
 echo '> Workaround for test issues: Change ownership of files inside docker container'
-docker-compose --env-file=.env exec -T app sh -c 'chown -R www-data:www-data /var/www'
+docker compose --env-file=.env exec -T app sh -c 'chown -R www-data:www-data /var/www'
 if docker run -i --rm ibexa_php:latest-node bash -c "php -v" | grep -q '8.3'; then
     echo '> Set PHP 8.2+ Ibexa error handler to avoid deprecations'
-    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\""
-    docker-compose --env-file=.env exec -T --user www-data app sh -c "composer dump-autoload"
+    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\""
+    docker compose --env-file=.env exec -T --user www-data app sh -c "composer dump-autoload"
 fi
 # Rebuild Symfony container
-docker-compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache/*"
-docker-compose --env-file=.env exec -T --user www-data app php bin/console cache:clear
+docker compose --env-file=.env exec -T --user www-data app sh -c "rm -rf var/cache/*"
+docker compose --env-file=.env exec -T --user www-data app php bin/console cache:clear
 # Install database & generate schema
-docker-compose --env-file=.env exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console ibexa:install"
-docker-compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema"
-docker-compose --env-file=.env exec -T --user www-data app sh -c "composer run post-install-cmd"
+docker compose --env-file=.env exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console ibexa:install"
+docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema"
+docker compose --env-file=.env exec -T --user www-data app sh -c "composer run post-install-cmd"
 
-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"
+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"
 
-docker-compose --env-file .env down -v
+docker compose --env-file .env down -v