From ba379e8f1b22d9912a6ac0c7ec50d5d6798a609a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 18 Feb 2022 15:58:17 +0100 Subject: [PATCH 1/3] Backported fixes from main branch --- bin/prepare_project_edition.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/prepare_project_edition.sh b/bin/prepare_project_edition.sh index b036eb1..0c13c22 100755 --- a/bin/prepare_project_edition.sh +++ b/bin/prepare_project_edition.sh @@ -74,8 +74,7 @@ docker exec install_dependencies composer update docker exec -e APP_ENV=dev install_dependencies composer require ibexa/${PROJECT_EDITION}:${PROJECT_VERSION} -W --no-scripts # Install BehatBundle -docker exec install_dependencies composer require ezsystems/behatbundle:^8.3.x-dev --no-scripts --no-plugins -docker exec install_dependencies composer sync-recipes ezsystems/behatbundle --force +docker exec install_dependencies composer require ezsystems/behatbundle:^8.3.x-dev --no-scripts # Init a repository to avoid Composer asking questions git init; git add . > /dev/null; @@ -134,7 +133,8 @@ docker-compose exec -T app sh -c 'chown -R www-data:www-data /var/www' # Rebuild container docker-compose exec -T --user www-data app sh -c "rm -rf var/cache/*" -docker-compose exec -T --user www-data app php bin/console cache:clear +echo '> Clear cache & generate assets' +docker-compose exec -T --user www-data app sh -c "composer run post-install-cmd" echo '> Install data' docker-compose exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console ibexa:install" @@ -142,7 +142,4 @@ docker-compose exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; echo '> Generate GraphQL schema' docker-compose exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" -echo '> Clear cache & generate assets' -docker-compose exec -T --user www-data app sh -c "composer run post-install-cmd" - echo '> Done, ready to run tests' From 1d503d1dbbd43314d7d44551928d1501f600c3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 11 Mar 2022 09:23:01 +0100 Subject: [PATCH 2/3] Added reset flag --- bin/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/prepare_project_edition.sh b/bin/prepare_project_edition.sh index 0c13c22..2b6b1c0 100755 --- a/bin/prepare_project_edition.sh +++ b/bin/prepare_project_edition.sh @@ -80,7 +80,7 @@ docker exec install_dependencies composer require ezsystems/behatbundle:^8.3.x-d git init; git add . > /dev/null; # Execute Ibexa recipes -docker exec install_dependencies composer recipes:install ibexa/${PROJECT_EDITION} --force +docker exec install_dependencies composer recipes:install ibexa/${PROJECT_EDITION} --force --reset # Install Docker stack docker exec install_dependencies composer require ibexa/docker:^0.1.x-dev --no-scripts From 7175924bfceadd3703af4556eca7c074b62412cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 21 Sep 2022 13:19:31 +0200 Subject: [PATCH 3/3] [Composer] Bumped czproject/git-php version to 4.0.3 (#59) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 01f3cef..4dddfea 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "symfony/console": "^5.2", "symfony/serializer": "^5.2", "symfony/property-access": "^5.2", - "czproject/git-php": "^3.18", + "czproject/git-php": "^4.0.3", "knplabs/github-api": "^3.0", "php-http/guzzle6-adapter": "^2.0", "guzzlehttp/guzzle": "^6.5",