From 372ad67280f5ce67b49fbac1fd11fd296395b200 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 5 Nov 2020 12:05:14 +0530 Subject: [PATCH 1/2] Remove --no-suggest param Signed-off-by: Riddhesh Sanghvi --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3a46690c..6987c0ad3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,9 +26,9 @@ install: - | # Run composer install for master else update. if [[ "$TRAVIS_BRANCH" = "master" ]]; then - composer install --prefer-dist --no-suggest --no-progress --no-interaction + composer install --prefer-dist --no-progress --no-interaction else - composer update --prefer-dist --no-suggest --no-progress --no-interaction + composer update --prefer-dist --no-progress --no-interaction fi - sudo ./ci/test-env-install.sh From 7b3586b59635df35202728943b45a4e45d325c97 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Thu, 5 Nov 2020 12:06:21 +0530 Subject: [PATCH 2/2] Update re-creation of phar steps Signed-off-by: Riddhesh Sanghvi --- ci/deploy.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index 3ed4eb852..0abe32ab7 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -31,14 +31,15 @@ set -x echo "|1|qPmmP7LVZ7Qbpk7AylmkfR0FApQ=|WUy1WS3F4qcr3R5Sc728778goPw= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts # Remove dev dependenices needed for testing +sudo rm -rf vendor if [[ "$TRAVIS_BRANCH" = "master" ]]; then - composer install --prefer-dist --no-suggest --no-progress --no-interaction --no-dev + composer install --prefer-dist --no-progress --no-interaction --no-dev else - composer update --prefer-dist --no-suggest --no-progress --no-interaction --no-dev + composer update --prefer-dist --no-progress --no-interaction --no-dev fi # Re create phar -bash "$TRAVIS_BUILD_DIR/ci/prepare.sh" +php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quiet git clone git@github.com:easyengine/easyengine-builds.git