aboutsummaryrefslogtreecommitdiff
path: root/util/travis_compiled_push.sh
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/travis_compiled_push.sh
parentcd369b710796505fb0dbcfafed546597eee3786d (diff)
downloadqmk_firmware-f61c99fdda6b05a64b06b718fbb0ff5db71d8bfd.tar.gz
qmk_firmware-f61c99fdda6b05a64b06b718fbb0ff5db71d8bfd.zip
Remove duplication of ssh keys and fix usage on PR builds (#5013)
Diffstat (limited to 'util/travis_compiled_push.sh')
-rwxr-xr-xutil/travis_compiled_push.sh16
1 files changed, 1 insertions, 15 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 @@
1#!/bin/bash 1#!/bin/bash
2 2
3TRAVIS_BRANCH="${TRAVIS_BRANCH:master}" 3source util/travis_push.sh
4TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}"
5TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
6TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
7 4
8set -o errexit -o nounset 5set -o errexit -o nounset
9 6
@@ -12,17 +9,6 @@ echo "Using git hash ${rev}"
12 9
13if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then 10if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
14 11
15git config --global user.name "QMK Bot"
16git config --global user.email "hello@qmk.fm"
17
18openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
19tar xvf secrets.tar
20
21chmod 600 id_rsa_qmk_firmware
22chmod 600 id_rsa_qmk.fm
23eval `ssh-agent -s`
24ssh-add id_rsa_qmk_firmware
25
26# convert to unix line-endings 12# convert to unix line-endings
27git checkout master 13git checkout master
28git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix 14git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix