summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-07-03 00:23:37 -0400
committerJack Humbert <jack.humb@gmail.com>2017-07-03 00:23:37 -0400
commitfe47b36065c59b7972abd6b28368d829f266ba5c (patch)
treedad28c15cedd6e8ea27fba3e36b3edb9f6507b6a
parentea134be36a447dbf25517336754f2a5c5f1da8a3 (diff)
downloadqmk_firmware-fe47b36065c59b7972abd6b28368d829f266ba5c.tar.gz
qmk_firmware-fe47b36065c59b7972abd6b28368d829f266ba5c.zip
fix tag increment
-rw-r--r--util/travis_compiled_push.sh3
1 files changed, 2 insertions, 1 deletions
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