From 9f9d01c544537136f42c0215c9054c0977a4f6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 25 Jun 2024 17:02:50 +0200 Subject: [PATCH 1/6] IBX-8422: Bump default image to PHP 8.3 --- bin/4.6.x-dev/prepare_project_edition.sh | 2 +- bin/^3.3.x-dev/prepare_project_edition.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/4.6.x-dev/prepare_project_edition.sh b/bin/4.6.x-dev/prepare_project_edition.sh index 8b28d1c..9904903 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -5,7 +5,7 @@ PROJECT_EDITION=$1 PROJECT_VERSION=$2 PROJECT_BUILD_DIR=${HOME}/build/project export COMPOSE_FILE=$3 -export PHP_IMAGE=${4-ghcr.io/ibexa/docker/php:8.1-node18} +export PHP_IMAGE=${4-ghcr.io/ibexa/docker/php:8.3-node18} export COMPOSER_MAX_PARALLEL_HTTP=6 # Reduce Composer parallelism to work around Github Actions network errors if [[ -n "${DOCKER_PASSWORD}" ]]; then diff --git a/bin/^3.3.x-dev/prepare_project_edition.sh b/bin/^3.3.x-dev/prepare_project_edition.sh index b223b04..bda5cd6 100644 --- a/bin/^3.3.x-dev/prepare_project_edition.sh +++ b/bin/^3.3.x-dev/prepare_project_edition.sh @@ -5,7 +5,7 @@ PROJECT_EDITION=$1 PROJECT_VERSION=$2 PROJECT_BUILD_DIR=${HOME}/build/project export COMPOSE_FILE=$3 -export PHP_IMAGE=${4-ghcr.io/ibexa/docker/php:8.1-node18} +export PHP_IMAGE=${4-ghcr.io/ibexa/docker/php:8.3-node18} export COMPOSER_MAX_PARALLEL_HTTP=6 # Reduce Composer parallelism to work around Github Actions network errors if [[ -n "${DOCKER_PASSWORD}" ]]; then From 7c34f26868d9fca60a26bcec40da3637553c4a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 26 Jun 2024 13:08:00 +0200 Subject: [PATCH 2/6] stable --- bin/stable/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index 6e0961e..ea42fa4 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -5,7 +5,7 @@ PROJECT_EDITION=$1 PROJECT_VERSION=$2 PROJECT_BUILD_DIR=${HOME}/build/project export COMPOSE_FILE=$3 -export PHP_IMAGE=${4-ezsystems/php:7.4-v2-node16} +export PHP_IMAGE=${4-ghcr.io/ibexa/docker/php:8.3-node18} export COMPOSER_MAX_PARALLEL_HTTP=6 # Reduce Composer parallelism to work around Github Actions network errors DEPENDENCY_PACKAGE_DIR=$(pwd) From aae1955acdfd18708f5d4bff949284d0e5f35c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 2 Jul 2024 13:27:39 +0200 Subject: [PATCH 3/6] stable: reverse create-project condition --- bin/stable/prepare_project_edition.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index ea42fa4..66e38b6 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -35,11 +35,11 @@ if [ -f ${DEPENDENCY_PACKAGE_DIR}/auth.json ]; then fi if [[ $PHP_IMAGE == *"7."* ]] || [[ $PHP_IMAGE == *"8.0"* ]] || [[ $PHP_IMAGE == *"8.3"* ]]; then - echo "> Running composer update" - docker exec install_dependencies composer update --no-scripts --ansi -else echo "> Running composer install" docker exec install_dependencies composer install --no-scripts --ansi +else + echo "> Running composer update" + docker exec install_dependencies composer update --no-scripts --ansi fi if [[ $PROJECT_VERSION == *"v3.3"* ]]; then From e13b53dd12b49e8b2488212b4adaa3e479eb3784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 2 Jul 2024 13:29:52 +0200 Subject: [PATCH 4/6] align error handler notification with 3.3.x --- bin/4.6.x-dev/prepare_project_edition.sh | 2 +- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- bin/stable/prepare_project_edition.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/4.6.x-dev/prepare_project_edition.sh b/bin/4.6.x-dev/prepare_project_edition.sh index 9904903..3e42412 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -137,7 +137,7 @@ docker exec install_dependencies composer update --no-scripts sudo sed -i "s/\['test' => true\]/\['test' => true, 'behat' => true\]/g" config/bundles.php if [[ $PHP_IMAGE == *"8.2"* ]] || [[ $PHP_IMAGE == *"8.3"* ]]; then - echo "> Set PHP 8.2 Ibexa error handler to avoid deprecations" + echo "> Set PHP 8.2+ Ibexa error handler to avoid deprecations" docker exec install_dependencies composer config extra.runtime.error_handler "\\Ibexa\\Contracts\\Core\\MVC\\Symfony\\ErrorHandler\\Php82HideDeprecationsErrorHandler" docker exec install_dependencies composer dump-autoload fi diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 9904903..3e42412 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -137,7 +137,7 @@ docker exec install_dependencies composer update --no-scripts sudo sed -i "s/\['test' => true\]/\['test' => true, 'behat' => true\]/g" config/bundles.php if [[ $PHP_IMAGE == *"8.2"* ]] || [[ $PHP_IMAGE == *"8.3"* ]]; then - echo "> Set PHP 8.2 Ibexa error handler to avoid deprecations" + echo "> Set PHP 8.2+ Ibexa error handler to avoid deprecations" docker exec install_dependencies composer config extra.runtime.error_handler "\\Ibexa\\Contracts\\Core\\MVC\\Symfony\\ErrorHandler\\Php82HideDeprecationsErrorHandler" docker exec install_dependencies composer dump-autoload fi diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index 66e38b6..09bbde1 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -57,7 +57,7 @@ sudo sed -i "s/\['test' => true\]/\['test' => true, 'behat' => true\]/g" config/ cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml if [[ $PHP_IMAGE == *"8.2"* ]] || [[ $PHP_IMAGE == *"8.3"* ]]; then - echo "> Set PHP 8.2 Ibexa error handler to avoid deprecations" + echo "> Set PHP 8.2+ Ibexa error handler to avoid deprecations" docker exec install_dependencies composer config extra.runtime.error_handler "\\Ibexa\\Contracts\\Core\\MVC\\Symfony\\ErrorHandler\\Php82HideDeprecationsErrorHandler" docker exec install_dependencies composer dump-autoload fi From 91a87ea20f126f7eaa3e4f9d9577098929647d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 3 Jul 2024 14:54:25 +0200 Subject: [PATCH 5/6] cr: stable: update create-project condition --- bin/stable/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index 09bbde1..bf02c58 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -34,7 +34,7 @@ if [ -f ${DEPENDENCY_PACKAGE_DIR}/auth.json ]; then cp ${DEPENDENCY_PACKAGE_DIR}/auth.json . fi -if [[ $PHP_IMAGE == *"7."* ]] || [[ $PHP_IMAGE == *"8.0"* ]] || [[ $PHP_IMAGE == *"8.3"* ]]; then +if [[ $PHP_IMAGE == *"8.3"* ]]; then echo "> Running composer install" docker exec install_dependencies composer install --no-scripts --ansi else From f5420d41434ed1aa16b484d44f88cb7bb23ff8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 4 Jul 2024 08:23:14 +0200 Subject: [PATCH 6/6] cr: stable: remove setting error handler --- bin/stable/prepare_project_edition.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index bf02c58..22750f0 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -56,12 +56,6 @@ sudo sed -i "s/\['test' => true\]/\['test' => true, 'behat' => true\]/g" config/ # Create a default Behat configuration file cp "behat_ibexa_${PROJECT_EDITION}.yaml" behat.yaml -if [[ $PHP_IMAGE == *"8.2"* ]] || [[ $PHP_IMAGE == *"8.3"* ]]; then - echo "> Set PHP 8.2+ Ibexa error handler to avoid deprecations" - docker exec install_dependencies composer config extra.runtime.error_handler "\\Ibexa\\Contracts\\Core\\MVC\\Symfony\\ErrorHandler\\Php82HideDeprecationsErrorHandler" - docker exec install_dependencies composer dump-autoload -fi - # Depenencies are installed and container can be removed docker container stop install_dependencies docker container rm install_dependencies