aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-07-02 23:38:20 -0400
committerJack Humbert <jack.humb@gmail.com>2017-07-02 23:38:20 -0400
commitea134be36a447dbf25517336754f2a5c5f1da8a3 (patch)
tree881165b90a61436281623f819483d55077ed0a64 /util
parentb7afa59c9714def787a08950d78ac674cf19728c (diff)
downloadqmk_firmware-ea134be36a447dbf25517336754f2a5c5f1da8a3.tar.gz
qmk_firmware-ea134be36a447dbf25517336754f2a5c5f1da8a3.zip
fix up travis script
Diffstat (limited to 'util')
-rw-r--r--util/travis_compiled_push.sh6
1 files changed, 5 insertions, 1 deletions
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}"