diff --git a/.travis.yml b/.travis.yml index 70dfcede..d7574b80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ services: addons: ssh_known_hosts: phpvms.net before_install: -- openssl aes-256-cbc -K $encrypted_6ae8173eef05_key -iv $encrypted_6ae8173eef05_iv - -in deploy_rsa.enc -out deploy_rsa -d - mysql -e 'CREATE DATABASE IF NOT EXISTS phpvms;' before_script: - cp .env.travis .env @@ -22,7 +20,7 @@ script: after_failure: - cat storage/logs/*.log before_deploy: -- openssl aes-256-cbc -K $encrypted_6ae8173eef05_key -iv $encrypted_6ae8173eef05_iv -in deploy_rsa.enc -out /tmp/deploy_rsa -d +- openssl aes-256-cbc -K $encrypted_6ae8173eef05_key -iv $encrypted_6ae8173eef05_iv -in .travis/deploy_rsa.enc -out /tmp/deploy_rsa -d - eval "$(ssh-agent -s)" - chmod 600 /tmp/deploy_rsa - ssh-add /tmp/deploy_rsa @@ -32,3 +30,4 @@ deploy: script: make deploy-package on: branch: master + php: '7.0' diff --git a/deploy_rsa.enc b/.travis/deploy_rsa.enc similarity index 100% rename from deploy_rsa.enc rename to .travis/deploy_rsa.enc diff --git a/deploy_script.sh b/.travis/deploy_script.sh similarity index 83% rename from deploy_script.sh rename to .travis/deploy_script.sh index 596fd64f..38fc780d 100755 --- a/deploy_script.sh +++ b/.travis/deploy_script.sh @@ -8,5 +8,5 @@ fi echo $PKG_NAME #rm -rf .git deploy_rsa.enc .idea phpvms.iml -tar -czvf $PKG_NAME.tar.gz -C $TRAVIS_BUILD_DIR . +tar -czf $PKG_NAME.tar.gz -C $TRAVIS_BUILD_DIR . rsync -r --delete-after --quiet $PKG_NAME.tar.gz downloads@phpvms.net:/var/www/downloads/ diff --git a/Makefile b/Makefile index 4ef6d7cc..6d0755b2 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ schema: .PHONY: deploy-package deploy-package: - ./deploy_script.sh + ./.travis/deploy_script.sh .PHONY: docker docker: