Przeglądaj źródła

fix tag increment

Jack Humbert 8 lat temu
rodzic
commit
fe47b36065
1 zmienionych plików z 2 dodań i 1 usunięć
  1. 2 1
      util/travis_compiled_push.sh

+ 2 - 1
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