diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-02-06 17:51:20 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-02-06 17:51:20 -0500 |
| commit | 5c8cdfd2b579c198ad37504772e663783f530685 (patch) | |
| tree | 61ed2c0f7e28104fe3b6ff4d046ad43af72706b3 | |
| parent | 246d2583ff5ceacdfcd877ac1b29762773dade0b (diff) | |
[skip build] testing travis script0.5.2
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 1a0a7bf15f..792f2cd05d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ language: c branches: except: - /^.*-automated-build$/ + - /^[0-9]+\.[0-9]+\.[0-9]+/ env: global: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index b70999c72f..8025ccb8fe 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -20,7 +20,8 @@ increment_version () NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) if [[ $NEFM -gt 0 ]] ; then echo "Essential files modified." - lasttag=$(git tag | grep -Ev '\-' | head -1) + git fetch --tags + lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort | awk '{print $4}' | tail -1) newtag=$(increment_version $lasttag) git tag $newtag git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware |