yohan/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update travis script

Browse Source
This commit is contained in:
Jack Humbert 2017-11-14 22:14:59 -05:00
parent dbabfb082c
commit cb64a886e9
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -21,8 +21,10 @@ override SILENT := false
QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null) QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null)
ifneq ($(QMK_VERSION),) ifneq ($(QMK_VERSION),)
ifneq ($(SILENT),)
$(info QMK Firmware $(QMK_VERSION)) $(info QMK Firmware $(QMK_VERSION))
endif endif
endif
ON_ERROR := error_occurred=1 ON_ERROR := error_occurred=1
@ -114,6 +116,14 @@ list-keyboards:
echo $(KEYBOARDS) echo $(KEYBOARDS)
exit 0 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 #Compatibility with the old make variables, anything you specify directly on the command line
# always overrides the detected folders # always overrides the detected folders
ifdef keyboard ifdef keyboard

7
util/travis_compiled_push.sh
View File

@ -54,22 +54,23 @@ else
fi fi
if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
make generate-keyboards-file SILENT=true > .keyboards
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
mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
mv ../qmk_firmware/.keyboards .
ssh-add -D ssh-add -D
eval `ssh-agent -s` eval `ssh-agent -s`
ssh-add id_rsa_qmk.fm ssh-add id_rsa_qmk.fm
# not sure this is needed now # not sure this is needed now
# rm -f compiled/*.hex rm -f compiled/*.hex
# ignore errors here # 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
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 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 git push git@github.com:qmk/qmk.fm.git