X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=dcf408a2e952d190dff345edf9ebbf9042d57aef;hb=71feac57175f5a3d09e96cc579f5d5c3477adb7b;hp=3751da1e53afd5bd4ef1993dc075004ac7f1726b;hpb=449ab9109ab0d04944de8430d8d910cf7f1e8856;p=qmk_firmware.git

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 3751da1e5..dcf408a2e 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -7,7 +7,15 @@ rev=$(git rev-parse --short HEAD)
 git config --global user.name "Travis CI"
 git config --global user.email "jack.humb+travis.ci@gmail.com"
 
-if [[ "$TRAVIS_BRANCH" == "master" ]] ; then
+openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk_firmware.enc -out qmk_firmware -d
+openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk.fm.enc -out qmk.fm -d
+chmod 600 qmk_firmware
+chmod 600 qmk.fm
+eval `ssh-agent -s`
+ssh-add qmk_firmware
+ssh-add qmk.fm
+
+if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
 
 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
 else
 	echo "No essential files modified."
 fi
@@ -33,18 +41,19 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 
 	make ergodox-ez AUTOGEN=true
 
-	find . -name ".build" | xargs rm -rf
 	cd ..
-	git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git
+	git clone git@github.com:qmk/qmk.fm.git
 	cd qmk.fm
-	git submodule update --init --recursive
-	rm -rf keyboard
-	rm -rf keyboards
-	cp -r ../qmk_firmware/keyboards .
-	mkdir keyboards/ergodox_ez/
-	cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
-	cp ../qmk_firmware/readme.md qmk_readme.md
-	./generate.sh
+	#git submodule update --init --recursive
+	#rm -rf keyboard
+	#rm -rf keyboards
+	#yes | cp -rf ../qmk_firmware/keyboards .
+	#mkdir keyboards/ergodox_ez/
+	#cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
+	#cp ../qmk_firmware/readme.md qmk_readme.md
+	#./generate.sh
+	rm -f _compiled/*.hex
+	for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
 
 	git add -A
 	git commit -m "generated from qmk/qmk_firmware@${rev}"