diff options
| author | U-LANDSRAAD\drashna <drashna@live.com> | 2018-03-24 14:06:58 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-03-25 13:19:14 -0400 |
| commit | f67950df27c5903254c9fac1d6e929599f813d6d (patch) | |
| tree | 9b5e168453394c86790ae5112ad48272da0585f9 /util/travis_compiled_push.sh | |
| parent | b23d2a68dc935a9acd709b703d33fbebdd2a18e5 (diff) | |
| download | qmk_firmware-f67950df27c5903254c9fac1d6e929599f813d6d.tar.gz qmk_firmware-f67950df27c5903254c9fac1d6e929599f813d6d.zip | |
Ignore users folder for Travis tagging
Diffstat (limited to 'util/travis_compiled_push.sh')
| -rw-r--r-- | util/travis_compiled_push.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 6be124122..eac7e27d5 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
| @@ -20,11 +20,11 @@ increment_version () { | |||
| 20 | part[2]=$((part[2] + 1)) | 20 | part[2]=$((part[2] + 1)) |
| 21 | new="${part[*]}" | 21 | new="${part[*]}" |
| 22 | echo -e "${new// /.}" | 22 | echo -e "${new// /.}" |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | 25 | git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} |
| 26 | 26 | ||
| 27 | NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) | 27 | NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(users/)' | wc -l) |
| 28 | if [[ $NEFM -gt 0 ]] ; then | 28 | if [[ $NEFM -gt 0 ]] ; then |
| 29 | echo "Essential files modified." | 29 | echo "Essential files modified." |
| 30 | git fetch --tags | 30 | git fetch --tags |
| @@ -49,7 +49,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | |||
| 49 | ssh-add -D | 49 | ssh-add -D |
| 50 | eval `ssh-agent -s` | 50 | eval `ssh-agent -s` |
| 51 | ssh-add id_rsa_qmk.fm | 51 | ssh-add id_rsa_qmk.fm |
| 52 | 52 | ||
| 53 | # don't delete files in case not all keyboards are built | 53 | # don't delete files in case not all keyboards are built |
| 54 | # rm -f compiled/*.hex | 54 | # rm -f compiled/*.hex |
| 55 | 55 | ||
| @@ -60,6 +60,6 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | |||
| 60 | for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done | 60 | for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done |
| 61 | bash _util/generate_keyboard_page.sh | 61 | bash _util/generate_keyboard_page.sh |
| 62 | git add -A | 62 | git add -A |
| 63 | git commit -m "generated from qmk/qmk_firmware@${rev}" | 63 | git commit -m "generated from qmk/qmk_firmware@${rev}" |
| 64 | git push git@github.com:qmk/qmk.fm.git | 64 | git push git@github.com:qmk/qmk.fm.git |
| 65 | fi | 65 | fi |
