Merge remote-tracking branch 'refs/remotes/qmk/master'

1 files changed, 46 insertions, 18 deletions

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index f432976d0..de2481ce5 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -7,21 +7,49 @@ rev=$(git rev-parse --short HEAD)
 git config --global user.name "Travis CI"
 git config --global user.email "jack.humb+travis.ci@gmail.com"
 
-make ergodox-ez AUTOGEN=true
-
-find . -name ".build" | xargs rm -rf
-cd ..
-git clone https://$GH_TOKEN@github.com/jackhumbert/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 add -A
-git commit -m "generated from qmk_firmware/$TRAVIS_BRANCH@${rev}" 
-git push
+if [[ "$TRAVIS_BRANCH" == "master" ]] ; then
+
+increment_version ()
+{
+  declare -a part=( ${1//\./ } )
+  part[2]=$((part[2] + 1))
+  new="${part[*]}"
+  echo -e "${new// /.}"
+} 
+
+NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | 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
+else
+	echo "No essential files modified."
+fi
+
+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
+	cd qmk.fm
+	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
+
+	git add -A
+	git commit -m "generated from qmk/qmk_firmware@${rev}" 
+	git push
+
+fi
+
+fi
\ No newline at end of file