ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix up travis script

Browse source
This commit is contained in:
Jack Humbert 2017-07-02 23:38:20 -04:00
parent b7afa59c97
commit ea134be36a
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -34,7 +34,7 @@ after_success:
notifications: notifications:
webhooks: webhooks:
urls: urls:
- https://webhooks.gitter.im/e/cca31de3d44b9adb617b - https://webhooks.gitter.im/e/afce403d65f143dfac09
on_success: change # options: [always|never|change] default: always on_success: always # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always on_failure: always # options: [always|never|change] default: always
on_start: never # options: [always|never|change] default: always on_start: never # options: [always|never|change] default: always

6
util/travis_compiled_push.sh
View file

@ -25,6 +25,8 @@ increment_version ()
echo -e "${new// /.}" 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/)' | wc -l)
if [[ $NEFM -gt 0 ]] ; then if [[ $NEFM -gt 0 ]] ; then
echo "Essential files modified." echo "Essential files modified."
@ -44,7 +46,8 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
cd .. cd ..
git clone git@github.com:qmk/qmk.fm.git git clone git@github.com:qmk/qmk.fm.git
cd qmk.fm 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 #git submodule update --init --recursive
#rm -rf keyboard #rm -rf keyboard
#rm -rf keyboards #rm -rf keyboards
@ -55,6 +58,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
#./generate.sh #./generate.sh
rm -f _compiled/*.hex 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
for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
git add -A git add -A
git commit -m "generated from qmk/qmk_firmware@${rev}" git commit -m "generated from qmk/qmk_firmware@${rev}"