summaryrefslogtreecommitdiffstats
path: root/util/travis_compiled_push.sh
diff options
context:
space:
mode:
authorU-LANDSRAAD\drashna <drashna@live.com>2018-03-24 14:06:58 -0700
committerJack Humbert <jack.humb@gmail.com>2018-03-25 13:19:14 -0400
commitf67950df27c5903254c9fac1d6e929599f813d6d (patch)
tree9b5e168453394c86790ae5112ad48272da0585f9 /util/travis_compiled_push.sh
parentb23d2a68dc935a9acd709b703d33fbebdd2a18e5 (diff)
Ignore users folder for Travis tagging
Diffstat (limited to 'util/travis_compiled_push.sh')
-rw-r--r--util/travis_compiled_push.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 6be1241220..eac7e27d5f 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -20,11 +20,11 @@ increment_version () {
part[2]=$((part[2] + 1))
new="${part[*]}"
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)
+NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(users/)' | wc -l)
if [[ $NEFM -gt 0 ]] ; then
echo "Essential files modified."
git fetch --tags
@@ -49,7 +49,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
ssh-add -D
eval `ssh-agent -s`
ssh-add id_rsa_qmk.fm
-
+
# don't delete files in case not all keyboards are built
# rm -f compiled/*.hex
@@ -60,6 +60,6 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
bash _util/generate_keyboard_page.sh
git add -A
- git commit -m "generated from qmk/qmk_firmware@${rev}"
+ git commit -m "generated from qmk/qmk_firmware@${rev}"
git push git@github.com:qmk/qmk.fm.git
fi