localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

update building for .hex, secrets moving

This commit is contained in:
Jack Humbert 2017-08-21 21:57:46 -04:00
parent 69c4cfb238
commit c3c07eff51
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -48,5 +48,4 @@ util/Win_Check_Output.txt
# things travis sees # things travis sees
secrets.tar secrets.tar
qmk.fm id_rsa_*
id_rsa_qmk_firmware

BIN
secrets.tar.enc
View File

Binary file not shown.

4
tmk_core/rules.mk
View File

@ -247,8 +247,8 @@ gccversion :
$(eval CMD=$(HEX) $< $@) $(eval CMD=$(HEX) $< $@)
@$(BUILD_CMD) @$(BUILD_CMD)
@if $(AUTOGEN); then \ @if $(AUTOGEN); then \
$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(KEYBOARD)_$(KEYMAP).hex\n"; \ $(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(TARGET).hex\n"; \
$(COPY) $@ $(KEYMAP_PATH)/$(KEYBOARD)_$(KEYMAP).hex; \ $(COPY) $@ $(KEYMAP_PATH)/$(TARGET).hex; \
else \ else \
$(COPY) $@ $(TARGET).hex; \ $(COPY) $@ $(TARGET).hex; \
fi fi

6
util/travis_compiled_push.sh
View File

@ -13,7 +13,7 @@ openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_i
tar xvf secrets.tar tar xvf secrets.tar
chmod 600 id_rsa_qmk_firmware chmod 600 id_rsa_qmk_firmware
chmod 600 qmk.fm chmod 600 id_rsa_qmk.fm
eval `ssh-agent -s` eval `ssh-agent -s`
ssh-add id_rsa_qmk_firmware ssh-add id_rsa_qmk_firmware
@ -51,10 +51,10 @@ 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
mv ../qmk_firmware/qmk.fm qmk.fm mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
ssh-add -D ssh-add -D
eval `ssh-agent -s` eval `ssh-agent -s`
ssh-add qmk.fm ssh-add id_rsa_qmk.fm
#git submodule update --init --recursive #git submodule update --init --recursive
#rm -rf keyboard #rm -rf keyboard
#rm -rf keyboards #rm -rf keyboards