diff --git a/.deploy_rsa.enc b/.deploy_rsa.enc index 04462f7..64cb861 100644 Binary files a/.deploy_rsa.enc and b/.deploy_rsa.enc differ diff --git a/.gitignore b/.gitignore index 3ac9264..bb954a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ node_modules cypress/videos +.deploy_rsa +.deploy_rsa.pub diff --git a/.travis.yml b/.travis.yml index c877996..5caad43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ addons: cache: directories: - ~/.npm + - ~/.cache - node_modules install: @@ -22,10 +23,11 @@ before_deploy: - eval "$(ssh-agent -s)" - chmod 600 /tmp/deploy_rsa - ssh-add /tmp/deploy_rsa - - npm run build:prod + - find public -type f -name "*.html" -exec sed -i -e "s/COMMIT_HASH/$TRAVIS_COMMIT/" {} \; deploy: provider: script - script: ssh -q -l root nginxconfig.io "sudo -u www-data -H sh -c 'cd /var/www/nginxconfig.io; git reset --hard && git pull origin master && find . -type f -name '*.html' -exec sed -i -e \"s/COMMIT_HASH/$TRAVIS_COMMIT/\" {} \;'" + script: rsync --checksum --delete --delete-after --force --ignore-errors --links --recursive --exclude="/node_modules/*" --exclude="/cypress/videos/*" ./ www-data@nginxconfig.io:/var/www/nginxconfig.io/ + skip_cleanup: true on: branch: master diff --git a/package.json b/package.json index 3fa1082..fe6ea16 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "build:prod": "node-sass --output-style=compressed resources/scss/app.scss public/assets/css/app.min.css", "test": "start-server-and-test start http://localhost:8080 cypress:run", "test:debug": "start-server-and-test start http://localhost:8080 cypress:open", - "cypress:run": "cypress run", + "cypress:run": "cypress run --record false", "cypress:open": "cypress open" } }