Skip to content

Commit

Permalink
ok, lets deploy a bit differently
Browse files Browse the repository at this point in the history
  • Loading branch information
piranha committed Jul 4, 2015
1 parent 4777427 commit 3a4c9d5
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ python:
- '2.7'
virtualenv:
system_site_packages: true
before_install:
- sudo apt-get install -qq python-yaml python-jinja2 python-smartypants
addons:
ssh_known_hosts: maia.solovyov.net
apt_packages:
- python-yaml
- python-jinja2
- python-smartypants
install:
- pip install cyrax
script:
- cyrax
- test 6000 -lt $(cat _build/index.html | wc -l)
after_success:
- .travis/deploy.sh
addons:
ssh_known_hosts: maia.solovyov.net
- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || .travis/deploy.sh'
16 changes: 8 additions & 8 deletions .travis/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/sh
#!/bin/bash

set -ev

if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
openssl aes-256-cbc -K $encrypted_61da1a775a65_key -iv $encrypted_61da1a775a65_iv -in .travis/deploy_key.enc -out .travis/deploy_key -d
chmod 600 .travis/deploy_key
git remote rm maia 2&>/dev/null || echo 'all clear'
git remote add maia dokku@maia.solovyov.net:osgc
GIT_SSH=".travis/deploy.sh" git push maia master
fi
openssl aes-256-cbc -K $encrypted_61da1a775a65_key -iv $encrypted_61da1a775a65_iv -in .travis/deploy_key.enc -out .travis/deploy_key -d
chmod 600 .travis/deploy_key

git remote remove maia 2&>/dev/null || echo 'all clear'
git remote add maia dokku@maia.solovyov.net:osgc

GIT_SSH=".travis/deploy.sh" git push maia master

0 comments on commit 3a4c9d5

Please sign in to comment.