X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_compiled_push.sh;h=27e77a92187cb8e690162e39cdb3c4fb7aa4044e;hb=371922ad61a8fe7a3fc591949a1ad81f63be02c8;hp=a6bf8311ba8345ed6f89328ff31a9845940691f0;hpb=ea134be36a447dbf25517336754f2a5c5f1da8a3;p=qmk_firmware.git

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index a6bf8311b..27e77a921 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -13,10 +13,16 @@ openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_i
 tar xvf secrets.tar
 
 chmod 600 id_rsa_qmk_firmware
-chmod 600 qmk.fm
+chmod 600 id_rsa_qmk.fm
 eval `ssh-agent -s`
 ssh-add id_rsa_qmk_firmware
 
+# convert to unix line-endings
+git checkout master
+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 master
+
 increment_version ()
 {
   declare -a part=( ${1//\./ } )
@@ -31,9 +37,11 @@ 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
+	newertag=$(increment_version $newtag)
+	git tag $newtag || git tag $newertag
 	git push --tags git@github.com:qmk/qmk_firmware.git
 else
 	echo "No essential files modified."
@@ -41,24 +49,20 @@ fi
 
 if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 
-	make ergodox-ez AUTOGEN=true
-
 	cd ..
 	git clone git@github.com:qmk/qmk.fm.git
 	cd qmk.fm
-	mv ../qmk_firmware/qmk.fm qmk.fm
-	ssh-add 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
-	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
+	mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
+	ssh-add -D
+	eval `ssh-agent -s`
+	ssh-add id_rsa_qmk.fm
+	
+	# not sure this is needed now
+	# rm -f compiled/*.hex
+
+	# ignore errors here
+	for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
+	for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
 
 	git add -A
 	git commit -m "generated from qmk/qmk_firmware@${rev}"