Skip to content

Commit

Permalink
update building for .hex, secrets moving
Browse files Browse the repository at this point in the history
  • Loading branch information
jackhumbert committed Aug 22, 2017
1 parent 69c4cfb commit c3c07ef
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,4 @@ util/Win_Check_Output.txt

# things travis sees
secrets.tar
qmk.fm
id_rsa_qmk_firmware
id_rsa_*
Binary file modified secrets.tar.enc
Binary file not shown.
4 changes: 2 additions & 2 deletions tmk_core/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ gccversion :
$(eval CMD=$(HEX) $< $@)
@$(BUILD_CMD)
@if $(AUTOGEN); then \
$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(KEYBOARD)_$(KEYMAP).hex\n"; \
$(COPY) $@ $(KEYMAP_PATH)/$(KEYBOARD)_$(KEYMAP).hex; \
$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(TARGET).hex\n"; \
$(COPY) $@ $(KEYMAP_PATH)/$(TARGET).hex; \
else \
$(COPY) $@ $(TARGET).hex; \
fi
Expand Down
6 changes: 3 additions & 3 deletions util/travis_compiled_push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_i
tar xvf secrets.tar

chmod 600 id_rsa_qmk_firmware
chmod 600 qmk.fm
chmod 600 id_rsa_qmk.fm
eval `ssh-agent -s`
ssh-add id_rsa_qmk_firmware

Expand Down Expand Up @@ -51,10 +51,10 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
cd ..
git clone [email protected]:qmk/qmk.fm.git
cd qmk.fm
mv ../qmk_firmware/qmk.fm qmk.fm
mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
ssh-add -D
eval `ssh-agent -s`
ssh-add qmk.fm
ssh-add id_rsa_qmk.fm
#git submodule update --init --recursive
#rm -rf keyboard
#rm -rf keyboards
Expand Down

0 comments on commit c3c07ef

Please sign in to comment.