From ea134be36a447dbf25517336754f2a5c5f1da8a3 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Sun, 2 Jul 2017 23:38:20 -0400
Subject: fix up travis script

---
 util/travis_compiled_push.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'util/travis_compiled_push.sh')

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 4e08be1206..a6bf8311ba 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -25,6 +25,8 @@ increment_version ()
   echo -e "${new// /.}"
 } 
 
+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."
@@ -44,7 +46,8 @@ 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
+	mv ../qmk_firmware/qmk.fm qmk.fm
+	ssh-add qmk.fm
 	#git submodule update --init --recursive
 	#rm -rf keyboard
 	#rm -rf keyboards
@@ -55,6 +58,7 @@ 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}" 
-- 
cgit v1.2.3


From fe47b36065c59b7972abd6b28368d829f266ba5c Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Mon, 3 Jul 2017 00:23:37 -0400
Subject: fix tag increment

---
 util/travis_compiled_push.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'util/travis_compiled_push.sh')

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index a6bf8311ba..4936ca0ba7 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -31,7 +31,8 @@ NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/
 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 git@github.com:qmk/qmk_firmware.git
-- 
cgit v1.2.3