summary refs log tree commit diff
path: root/util
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2019-07-11 22:33:25 -0700
committerGitHub <noreply@github.com>2019-07-11 22:33:25 -0700
commit37d2f6dc2aed10e35f497c269a6e988e10436268 (patch)
tree7d241c385e47810aecb2864aa814ff4917d53aaf /util
parent475d2c0c303e9f57d7034fd478ceb724fdd0df44 (diff)
Switch version incrementing to the command put together by @noroadsleft. (#6310)
* 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>
Diffstat (limited to 'util')
-rwxr-xr-xutil/travis_compiled_push.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 25ed83fb03..04021ae7c2 100755
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -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)