summaryrefslogtreecommitdiffstats
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)
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 4e08be1206..a6bf8311ba 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -25,6 +25,8 @@ 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."
@@ -44,7 +46,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 +58,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}"