]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Switch version incrementing to the command put together by @noroadsleft. (#6310)
authorskullydazed <skullydazed@users.noreply.github.com>
Fri, 12 Jul 2019 05:33:25 +0000 (22:33 -0700)
committerGitHub <noreply@github.com>
Fri, 12 Jul 2019 05:33:25 +0000 (22:33 -0700)
* Switch version incrementing to the command put together by @noroadsleft.

* Update util/travis_compiled_push.sh

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
util/travis_compiled_push.sh

index 25ed83fb0317a78889b4048551d8aa4d7ac42c6c..04021ae7c25618030a530dbc71acd9565bd6da98 100755 (executable)
@@ -29,8 +29,7 @@ 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 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)
+       lasttag=$(git tag --sort=-creatordate --no-column --list '*.*.*' | grep -E -m1 '^[0-9]+\.[0-9]+\.[0-9]+$')
        newtag=$(increment_version $lasttag)
        until git tag $newtag; do
                newtag=$(increment_version $newtag)