Remove AUTOGEN and fix Travis Compiled Push scripts (#5077)

[qmk_firmware.git] / util / travis_compiled_push.sh

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
old mode 100644 (file)
new mode 100755 (executable)
index bc2a4f8..155a9a8
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -8,6 +8,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 set -o errexit -o nounset
 
 rev=$(git rev-parse --short HEAD)
+echo "Using git hash ${rev}"
 
 if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
 
@@ -34,11 +35,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/)' | grep -Ev '^(layouts/)' | wc -l)
 if [[ $NEFM -gt 0 ]] ; then
        echo "Essential files modified."
        git fetch --tags
@@ -63,18 +64,19 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
        ssh-add -D
        eval `ssh-agent -s`
        ssh-add id_rsa_qmk.fm
-       
-       # not sure this is needed now
-       rm -f compiled/*.hex
+
+       # don't delete files in case not all keyboards are built
+       # rm -f compiled/*.hex
 
        # ignore errors here
-       for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
-       for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
-       _util/generate_keyboard_page.sh
+  # In theory, this is more flexible, and will allow for additional expansion of additional types of files and other names
+  mv -t compiled ../qmk_firmware/*_default.*(hex|bin) || true
+
+       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
 
-fi
\ No newline at end of file
+fi