aboutsummaryrefslogtreecommitdiffstats
path: root/util/travis_push.sh
diff options
context:
space:
mode:
authorGravatar zvecr <git@zvecr.com>2019-02-15 14:47:47 +0000
committerGravatar MechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-02-15 06:47:47 -0800
commitf61c99fdda6b05a64b06b718fbb0ff5db71d8bfd (patch)
tree0f90b9b80bb2b65dd9e1fa6f6c447080c4cbdaa3 /util/travis_push.sh
parentcd369b710796505fb0dbcfafed546597eee3786d (diff)
downloadqmk_firmware-f61c99fdda6b05a64b06b718fbb0ff5db71d8bfd.tar.gz
Remove duplication of ssh keys and fix usage on PR builds (#5013)
Diffstat (limited to 'util/travis_push.sh')
-rwxr-xr-xutil/travis_push.sh18
1 files changed, 10 insertions, 8 deletions
diff --git a/util/travis_push.sh b/util/travis_push.sh
index 7eea88b14..d100f9d48 100755
--- a/util/travis_push.sh
+++ b/util/travis_push.sh
@@ -5,13 +5,15 @@ TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}"
TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
-git config --global user.name "QMK Bot"
-git config --global user.email "hello@qmk.fm"
+if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
+ git config --global user.name "QMK Bot"
+ git config --global user.email "hello@qmk.fm"
-openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
-tar xvf secrets.tar
+ openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
+ tar xvf secrets.tar
-chmod 600 id_rsa_qmk_firmware
-chmod 600 id_rsa_qmk.fm
-eval `ssh-agent -s`
-ssh-add id_rsa_qmk_firmware
+ chmod 600 id_rsa_qmk_firmware
+ chmod 600 id_rsa_qmk.fm
+ eval `ssh-agent -s`
+ ssh-add id_rsa_qmk_firmware
+fi