Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down