aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rw-r--r--util/travis_compiled_push.sh6
2 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index f5039769b..1707c0599 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ after_success:
34notifications: 34notifications:
35 webhooks: 35 webhooks:
36 urls: 36 urls:
37 - https://webhooks.gitter.im/e/cca31de3d44b9adb617b 37 - https://webhooks.gitter.im/e/afce403d65f143dfac09
38 on_success: change # options: [always|never|change] default: always 38 on_success: always # options: [always|never|change] default: always
39 on_failure: always # options: [always|never|change] default: always 39 on_failure: always # options: [always|never|change] default: always
40 on_start: never # options: [always|never|change] default: always \ No newline at end of file 40 on_start: never # options: [always|never|change] default: always \ No newline at end of file
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 4e08be120..a6bf8311b 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -25,6 +25,8 @@ increment_version ()
25 echo -e "${new// /.}" 25 echo -e "${new// /.}"
26} 26}
27 27
28git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
29
28NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) 30NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l)
29if [[ $NEFM -gt 0 ]] ; then 31if [[ $NEFM -gt 0 ]] ; then
30 echo "Essential files modified." 32 echo "Essential files modified."
@@ -44,7 +46,8 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
44 cd .. 46 cd ..
45 git clone git@github.com:qmk/qmk.fm.git 47 git clone git@github.com:qmk/qmk.fm.git
46 cd qmk.fm 48 cd qmk.fm
47 ssh-add ../qmk_firmware/qmk.fm 49 mv ../qmk_firmware/qmk.fm qmk.fm
50 ssh-add qmk.fm
48 #git submodule update --init --recursive 51 #git submodule update --init --recursive
49 #rm -rf keyboard 52 #rm -rf keyboard
50 #rm -rf keyboards 53 #rm -rf keyboards
@@ -55,6 +58,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
55 #./generate.sh 58 #./generate.sh
56 rm -f _compiled/*.hex 59 rm -f _compiled/*.hex
57 for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done 60 for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
61 for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
58 62
59 git add -A 63 git add -A
60 git commit -m "generated from qmk/qmk_firmware@${rev}" 64 git commit -m "generated from qmk/qmk_firmware@${rev}"