From c3c07eff51accaffeefa66105bd3094bfe61a9bf Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Mon, 21 Aug 2017 21:57:46 -0400 Subject: [PATCH] update building for .hex, secrets moving --- .gitignore | 3 +-- secrets.tar.enc | Bin 10256 -> 10256 bytes tmk_core/rules.mk | 4 ++-- util/travis_compiled_push.sh | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 599963a7d6b..580d62e9442 100644 --- a/.gitignore +++ b/.gitignore @@ -48,5 +48,4 @@ util/Win_Check_Output.txt # things travis sees secrets.tar -qmk.fm -id_rsa_qmk_firmware \ No newline at end of file +id_rsa_* \ No newline at end of file diff --git a/secrets.tar.enc b/secrets.tar.enc index 03fdf41c8bdc0dc0eb0e1868a841e9a1c13a8795..6c613fed98cc4ae7553e92b854acea154aca8d1f 100644 GIT binary patch literal 10256 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 WOW;zBDsB<37HTb|!le>*bF9Q7+XXlP diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index be06d611b6c..aef4d5e5520 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -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 diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index dc492ba94e0..833fa8e4654 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -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 @@ -51,10 +51,10 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then cd .. git clone git@github.com: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