diff options
Diffstat (limited to 'util/travis_compiled_push.sh')
| -rw-r--r-- | util/travis_compiled_push.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 4e08be120..4936ca0ba 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -25,11 +25,14 @@ increment_version () echo -e "${new// /.}" } +git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} + NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) 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 @@ -44,7 +47,8 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then cd .. git clone git@github.com:qmk/qmk.fm.git cd qmk.fm - ssh-add ../qmk_firmware/qmk.fm + mv ../qmk_firmware/qmk.fm qmk.fm + ssh-add qmk.fm #git submodule update --init --recursive #rm -rf keyboard #rm -rf keyboards @@ -55,6 +59,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then #./generate.sh rm -f _compiled/*.hex for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done + for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done git add -A git commit -m "generated from qmk/qmk_firmware@${rev}" |