Browse Source

update building for .hex, secrets moving

pjones-keymap
Jack Humbert 2 years ago
parent
commit
c3c07eff51
4 changed files with 6 additions and 7 deletions
  1. 1
    2
      .gitignore
  2. BIN
      secrets.tar.enc
  3. 2
    2
      tmk_core/rules.mk
  4. 3
    3
      util/travis_compiled_push.sh

+ 1
- 2
.gitignore View File

@@ -48,5 +48,4 @@ util/Win_Check_Output.txt

# things travis sees
secrets.tar
qmk.fm
id_rsa_qmk_firmware
id_rsa_*

BIN
secrets.tar.enc View File


+ 2
- 2
tmk_core/rules.mk View File

@@ -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

+ 3
- 3
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

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

Loading…
Cancel
Save