From f416ef925b270c2a376ed6ca6ca261481011a7f0 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 29 Jun 2019 15:57:30 +0200 Subject: [PATCH] Only create private key if DEPLOY_KEY_ENC is set --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9f4e92a9..f69896595 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,10 @@ compiler: - clang before_install: - - echo $DEPLOY_KEY_ENC | base64 --decode | openssl aes-256-cbc -K $encrypted_83a41ac424a6_key -iv $encrypted_83a41ac424a6_iv -out ~/.ssh/id_rsa -d - - chmod 600 ~/.ssh/id_rsa + - if ! [ "$DEPLOY_KEY_ENC" == "" ]; then + echo $DEPLOY_KEY_ENC | base64 --decode | openssl aes-256-cbc -K $encrypted_83a41ac424a6_key -iv $encrypted_83a41ac424a6_iv -out ~/.ssh/id_rsa -d ; + chmod 600 ~/.ssh/id_rsa ; + fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -f Dockerfile -t strawberry-build .; docker run --name build -itd strawberry-build /bin/bash; @@ -46,7 +48,7 @@ script: fi after_success: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -lh strawberry.dmg; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_BRANCH" == "master" ]] && [[ "$CC_FOR_BUILD" == "gcc" ]]; then rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_BRANCH" == "master" ]] && [[ "$CC_FOR_BUILD" == "gcc" ]] && [ -f ~/.ssh/id_rsa ]; then rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos; fi branches: except: