diff options
| author | zvecr <git@zvecr.com> | 2019-02-15 14:47:47 +0000 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-02-15 06:47:47 -0800 |
| commit | f61c99fdda6b05a64b06b718fbb0ff5db71d8bfd (patch) | |
| tree | 0f90b9b80bb2b65dd9e1fa6f6c447080c4cbdaa3 /util/travis_push.sh | |
| parent | cd369b710796505fb0dbcfafed546597eee3786d (diff) | |
| download | qmk_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_push.sh')
| -rwxr-xr-x | util/travis_push.sh | 18 |
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}" | |||
| 5 | TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" | 5 | TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" |
| 6 | TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" | 6 | TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" |
| 7 | 7 | ||
| 8 | git config --global user.name "QMK Bot" | 8 | if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then |
| 9 | git config --global user.email "hello@qmk.fm" | 9 | git config --global user.name "QMK Bot" |
| 10 | git config --global user.email "hello@qmk.fm" | ||
| 10 | 11 | ||
| 11 | openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d | 12 | openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d |
| 12 | tar xvf secrets.tar | 13 | tar xvf secrets.tar |
| 13 | 14 | ||
| 14 | chmod 600 id_rsa_qmk_firmware | 15 | chmod 600 id_rsa_qmk_firmware |
| 15 | chmod 600 id_rsa_qmk.fm | 16 | chmod 600 id_rsa_qmk.fm |
| 16 | eval `ssh-agent -s` | 17 | eval `ssh-agent -s` |
| 17 | ssh-add id_rsa_qmk_firmware | 18 | ssh-add id_rsa_qmk_firmware |
| 19 | fi | ||