X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=dc492ba94e01af3174d50fb4550310d6b04ca37c;hb=fa6bcfd10c4ff70d90c4223c2b5058b06138267a;hp=718daaa295637ac8ebd65c623fd0ff3b44172c58;hpb=c686793b596cd3e2977a4c76b976df31e18bdb5b;p=qmk_firmware.git

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 718daaa29..dc492ba94 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -4,11 +4,25 @@ set -o errexit -o nounset
 
 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" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
 
+git config --global user.name "QMK Bot"
+git config --global user.email "hello@qmk.fm"
+
+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
+
+# convert to unix line-endings
+git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
+git diff --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
+git commit -m "convert to unix line-endings [skip ci]"
+git push git@github.com:qmk/qmk_firmware.git
+
 increment_version ()
 {
   declare -a part=( ${1//\./ } )
@@ -17,25 +31,30 @@ increment_version ()
   echo -e "${new// /.}"
 } 
 
-NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
+git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
+
+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)
+	#lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
+	lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | sort -V | 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
 
 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
+	mv ../qmk_firmware/qmk.fm qmk.fm
+	ssh-add -D
+	eval `ssh-agent -s`
+	ssh-add qmk.fm
 	#git submodule update --init --recursive
 	#rm -rf keyboard
 	#rm -rf keyboards
@@ -46,10 +65,11 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	#./generate.sh
 	rm -f _compiled/*.hex
 	for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
+	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}" 
-	git push
+	git push git@github.com:qmk/qmk.fm.git
 
 fi