X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=2f5f74f93efa1110da1e76384f160f1435bdb353;hb=3a1a7d647283681be4681990619061249717a99a;hp=718daaa295637ac8ebd65c623fd0ff3b44172c58;hpb=4f1007952b4deea2012be4787789289fae7c19e1;p=qmk_firmware.git

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 718daaa29..2f5f74f93 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -4,10 +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"
 
-if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
+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
 
 increment_version ()
 {
@@ -17,14 +25,14 @@ increment_version ()
   echo -e "${new// /.}"
 } 
 
-NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
+NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l)
 if [[ $NEFM -gt 0 ]] ; then
 	echo "Essential files modified."
 	git fetch --tags
 	lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
 	newtag=$(increment_version $lasttag)
 	git tag $newtag
-	git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware
+	git push --tags git@github.com:qmk/qmk_firmware.git
 else
 	echo "No essential files modified."
 fi
@@ -34,8 +42,9 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	make ergodox-ez AUTOGEN=true
 
 	cd ..
-	git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git
+	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
@@ -49,7 +58,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 
 	git add -A
 	git commit -m "generated from qmk/qmk_firmware@${rev}" 
-	git push
+	git push git@github.com:qmk/qmk.fm.git
 
 fi