From 0720142a531c8f8c2e8ee8882cb3035e0b928ace Mon Sep 17 00:00:00 2001 From: ThomasSamson Date: Fri, 29 Mar 2024 10:42:26 +0100 Subject: [PATCH 1/2] Fix project name in doc --- .env | 2 +- ERRORS.md | 2 +- docs/install.md | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.env b/.env index abc5c9b..8597c75 100644 --- a/.env +++ b/.env @@ -78,7 +78,7 @@ SMS_DSN=null://null ###< symfony/notifier ### ###> symfony/fake-sms-notifier ### -FAKE_SMS_DSN=fakesms+email://mailer?to=admin&from=PlateformCoop +FAKE_SMS_DSN=fakesms+email://mailer?to=admin&from=plateforme ###< symfony/fake-sms-notifier ### ###> snc/redis-bundle ### diff --git a/ERRORS.md b/ERRORS.md index 46d7968..1751050 100644 --- a/ERRORS.md +++ b/ERRORS.md @@ -6,7 +6,7 @@ This documention gives solutions for some errors occuring in the project. ### Error 1.1 - plateformcoop-ebs$ docker compose exec php ./vendor/bin/php-cs-fixer fix --allow-risky=yes + plateforme-ebs$ docker compose exec php ./vendor/bin/php-cs-fixer fix --allow-risky=yes OCI runtime exec failed: exec failed: unable to start container process: exec: "./vendor/bin/php-cs-fixer": permission denied: unknown ### Solution 1.1 diff --git a/docs/install.md b/docs/install.md index a278b61..be601e8 100644 --- a/docs/install.md +++ b/docs/install.md @@ -105,7 +105,7 @@ Which gives: Install the project dependencies: - cd /var/www/plateformcoop-ebs + cd /var/www/plateforme-ebs composer install --ignore-platform-req=php The `--ignore-platform-` options is required if you have a PHP version below `8.1.11`. @@ -161,12 +161,12 @@ And put: ServerAdmin admin@example.com - DocumentRoot /var/www/plateformcoop-ebs/public + DocumentRoot /var/www/plateforme-ebs/public ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined - + AllowOverride All Require all granted FallbackResource /index.php @@ -198,7 +198,7 @@ Close and reopen the session so nvm is available: Then run: - cd /var/www/plateformcoop-ebs + cd /var/www/plateforme-ebs yarn install yarn build @@ -209,8 +209,8 @@ Be careful that is you run the commands as root some files may not have the corr rights. The following directory should be owned by the web server user: - chown -R /var/www/plateformcoop-ebs/public - chown -R /var/www/plateformcoop-ebs/var + chown -R /var/www/plateforme-ebs/public + chown -R /var/www/plateforme-ebs/var ## Parameters From fad4c9224371e5d47dc32ebef22585112d076c92 Mon Sep 17 00:00:00 2001 From: Slim Amamou Date: Fri, 29 Mar 2024 11:11:41 +0100 Subject: [PATCH 2/2] Update README.md (#702) improved sync section --- docs/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/README.md b/docs/README.md index 63f0942..defa8aa 100644 --- a/docs/README.md +++ b/docs/README.md @@ -75,3 +75,12 @@ Run the tests and generate the code coverage report: Run all checks like the Github CI: make ci + +### Import a commit into customers repo + +1. go to customer repo tree +2. add les tilleuls repo as a remote : `git remote add source git@github.com:coopTilleuls/plateformcoop-ebs.git` +3. change to sync branch : `git checkout chore/sync-les-tilleuls` +4. update the branch by merging main : `git merge main` +5. update source remote : `git fetch source` +6. cherry-pick the commits you want : `git cherry-pick `