aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-08-21 21:57:46 -0400
committerJack Humbert <jack.humb@gmail.com>2017-08-21 21:57:46 -0400
commitc3c07eff51accaffeefa66105bd3094bfe61a9bf (patch)
tree57b5664a3d686bb540616d2d849a7c1fb9c75801
parent69c4cfb23839abfd2ded51e7829216e667a2df10 (diff)
downloadfirmware-c3c07eff51accaffeefa66105bd3094bfe61a9bf.tar.gz
firmware-c3c07eff51accaffeefa66105bd3094bfe61a9bf.tar.bz2
firmware-c3c07eff51accaffeefa66105bd3094bfe61a9bf.zip
update building for .hex, secrets moving
-rw-r--r--.gitignore3
-rw-r--r--secrets.tar.encbin10256 -> 10256 bytes
-rw-r--r--tmk_core/rules.mk4
-rw-r--r--util/travis_compiled_push.sh6
4 files changed, 6 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 599963a7d..580d62e94 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 03fdf41c8..6c613fed9 100644
--- a/secrets.tar.enc
+++ b/secrets.tar.enc
Binary files differ
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index be06d611b..aef4d5e55 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 dc492ba94..833fa8e46 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