diff options
| author | skullydazed <skullydazed@users.noreply.github.com> | 2019-07-11 22:33:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 22:33:25 -0700 |
| commit | 37d2f6dc2aed10e35f497c269a6e988e10436268 (patch) | |
| tree | 7d241c385e47810aecb2864aa814ff4917d53aaf | |
| parent | 475d2c0c303e9f57d7034fd478ceb724fdd0df44 (diff) | |
| download | qmk_firmware-37d2f6dc2aed10e35f497c269a6e988e10436268.tar.gz qmk_firmware-37d2f6dc2aed10e35f497c269a6e988e10436268.zip | |
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>
| -rwxr-xr-x | util/travis_compiled_push.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 25ed83fb0..04021ae7c 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/ | |||
| 29 | if [[ $NEFM -gt 0 ]] ; then | 29 | if [[ $NEFM -gt 0 ]] ; then |
| 30 | echo "Essential files modified." | 30 | echo "Essential files modified." |
| 31 | git fetch --tags | 31 | git fetch --tags |
| 32 | #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) | 32 | lasttag=$(git tag --sort=-creatordate --no-column --list '*.*.*' | grep -E -m1 '^[0-9]+\.[0-9]+\.[0-9]+$') |
| 33 | lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | sort -V | tail -1) | ||
| 34 | newtag=$(increment_version $lasttag) | 33 | newtag=$(increment_version $lasttag) |
| 35 | until git tag $newtag; do | 34 | until git tag $newtag; do |
| 36 | newtag=$(increment_version $newtag) | 35 | newtag=$(increment_version $newtag) |
