summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-05-30 11:46:25 -0400
committerJack Humbert <jack.humb@gmail.com>2017-05-30 11:46:25 -0400
commit7eccbfe73764dbac0c33065394a8b86c4952eabf (patch)
tree4cbbfae8251dbd14ab287540e81d7f32f0baa3d5 /util
parent0c351fa98bff6a2e9d3ff30cc19d6b0782b85a62 (diff)
exclude PRs
Diffstat (limited to 'util')
-rw-r--r--util/travis_compiled_push.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 853795369f..2f5f74f93e 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -4,16 +4,18 @@ set -o errexit -o nounset
rev=$(git rev-parse --short HEAD)
+if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
+
git config --global user.name "Travis CI"
git config --global user.email "jack.humb+travis.ci@gmail.com"
+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 qmk.fm
eval `ssh-agent -s`
ssh-add id_rsa_qmk_firmware
-ssh-add qmk.fm
-
-if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
increment_version ()
{
@@ -42,6 +44,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
cd ..
git clone git@github.com:qmk/qmk.fm.git
cd qmk.fm
+ ssh-add ../qmk_firmware/qmk.fm
#git submodule update --init --recursive
#rm -rf keyboard
#rm -rf keyboards