From 7b637d6a616d13a305369a3d2c95afa1506a21d5 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 27 Aug 2022 17:48:59 +0200 Subject: [PATCH] Ensured RoadRunner deps are removed when building openswoole dist file --- build.sh | 6 +++++- config/roadrunner/.rr.yml | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index e274210a..219ccd2d 100755 --- a/build.sh +++ b/build.sh @@ -24,18 +24,22 @@ rsync -av * "${builtContent}" \ --exclude=*docker* \ --exclude=Dockerfile \ --include=.htaccess \ + --include=config/roadrunner/.rr.yml \ --exclude-from=./.dockerignore cd "${builtContent}" # Install dependencies echo "Installing dependencies with $composerBin..." -composerFlags="--optimize-autoloader --no-progress --no-interaction" +composerFlags="--optimize-autoloader --no-progress --no-interaction --ignore-platform-reqs" ${composerBin} self-update ${composerBin} install --no-dev --prefer-dist $composerFlags if [[ $noSwoole ]]; then # If generating a dist not for openswoole, uninstall mezzio-swoole ${composerBin} remove mezzio/mezzio-swoole --with-all-dependencies --update-no-dev $composerFlags +else + # If generating a dist for openswoole, uninstall RoadRunner + ${composerBin} remove spiral/roadrunner spiral/roadrunner-jobs --with-all-dependencies --update-no-dev $composerFlags fi # Delete development files diff --git a/config/roadrunner/.rr.yml b/config/roadrunner/.rr.yml index 40c93b2b..d44801ee 100644 --- a/config/roadrunner/.rr.yml +++ b/config/roadrunner/.rr.yml @@ -34,5 +34,3 @@ logs: level: info # Log all http requests, set to info to disable server: level: debug # Everything written to worker stderr is logged - metrics: - level: error