Commit afd3c08a authored by Ian Craggs's avatar Ian Craggs

Merge branch 'master' into develop

parents 59d4da07 a35c12d0
...@@ -17,10 +17,8 @@ matrix: ...@@ -17,10 +17,8 @@ matrix:
os: linux os: linux
before_install: before_install:
- openssl aes-256-cbc -K $encrypted_dcd2b299f7c9_key -iv $encrypted_dcd2b299f7c9_iv -in deploy_rsa.enc -out /tmp/deploy_rsa -d - if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_REPO_SLUG" = "eclipse/paho.mqtt.c" ]; then export DEPLOY=true; fi
- eval "$(ssh-agent -s)" - if [ "$DEPLOY" = "true" ]; then ./travis-setup-deploy.sh; fi
- chmod 600 /tmp/deploy_rsa
- ssh-add /tmp/deploy_rsa
- ./travis-install.sh - ./travis-install.sh
env: env:
...@@ -53,4 +51,4 @@ addons: ...@@ -53,4 +51,4 @@ addons:
after_success: after_success:
- ls -l build.paho/*.tar.gz - ls -l build.paho/*.tar.gz
- scp -o StrictHostKeyChecking=no build.paho/*.tar.gz icraggs@build.eclipse.org:../../../../shared/technology/paho/C/ - if [ "$DEPLOY" = "true" ]; then ./travis-deploy.sh; fi
scp -o StrictHostKeyChecking=no build.paho/*.tar.gz icraggs@build.eclipse.org:../../../../shared/technology/paho/C/
openssl aes-256-cbc -K $encrypted_dcd2b299f7c9_key -iv $encrypted_dcd2b299f7c9_iv -in deploy_rsa.enc -out /tmp/deploy_rsa -d
eval "$(ssh-agent -s)"
chmod 600 /tmp/deploy_rsa
ssh-add /tmp/deploy_rsa
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment