aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorzvecr <git@zvecr.com>2019-02-15 14:47:47 +0000
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-02-15 06:47:47 -0800
commitf61c99fdda6b05a64b06b718fbb0ff5db71d8bfd (patch)
tree0f90b9b80bb2b65dd9e1fa6f6c447080c4cbdaa3 /util
parentcd369b710796505fb0dbcfafed546597eee3786d (diff)
downloadfirmware-f61c99fdda6b05a64b06b718fbb0ff5db71d8bfd.tar.gz
firmware-f61c99fdda6b05a64b06b718fbb0ff5db71d8bfd.tar.bz2
firmware-f61c99fdda6b05a64b06b718fbb0ff5db71d8bfd.zip
Remove duplication of ssh keys and fix usage on PR builds (#5013)
Diffstat (limited to 'util')
-rwxr-xr-xutil/travis_compiled_push.sh16
-rwxr-xr-xutil/travis_push.sh18
2 files changed, 11 insertions, 23 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index c05b842a0..d76030f83 100755
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -1,9 +1,6 @@
#!/bin/bash
-TRAVIS_BRANCH="${TRAVIS_BRANCH:master}"
-TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}"
-TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
-TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
+source util/travis_push.sh
set -o errexit -o nounset
@@ -12,17 +9,6 @@ echo "Using git hash ${rev}"
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
-
-chmod 600 id_rsa_qmk_firmware
-chmod 600 id_rsa_qmk.fm
-eval `ssh-agent -s`
-ssh-add id_rsa_qmk_firmware
-
# convert to unix line-endings
git checkout master
git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
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