From cb64a886e9c53ca165a057c9e3d0dc1022c4d323 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 14 Nov 2017 22:14:59 -0500 Subject: update travis script --- Makefile | 10 ++++++++++ util/travis_compiled_push.sh | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e67e2fa093..c98c0f2980 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,10 @@ override SILENT := false QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null) ifneq ($(QMK_VERSION),) +ifneq ($(SILENT),) $(info QMK Firmware $(QMK_VERSION)) endif +endif ON_ERROR := error_occurred=1 @@ -114,6 +116,14 @@ list-keyboards: echo $(KEYBOARDS) exit 0 +define PRINT_KEYBOARD + $(info $(PRINTING_KEYBOARD)) +endef + +generate-keyboards-file: + $(foreach PRINTING_KEYBOARD,$(KEYBOARDS),$(eval $(call PRINT_KEYBOARD))) + exit 0 + #Compatibility with the old make variables, anything you specify directly on the command line # always overrides the detected folders ifdef keyboard diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 9ed1babe07..bc2a4f87b2 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -54,22 +54,23 @@ else fi if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then - + make generate-keyboards-file SILENT=true > .keyboards cd .. git clone git@github.com:qmk/qmk.fm.git cd qmk.fm mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm + mv ../qmk_firmware/.keyboards . ssh-add -D eval `ssh-agent -s` ssh-add id_rsa_qmk.fm # not sure this is needed now - # rm -f compiled/*.hex + 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 git add -A git commit -m "generated from qmk/qmk_firmware@${rev}" git push git@github.com:qmk/qmk.fm.git -- cgit v1.2.1