Browse Source

update building for .hex, secrets moving

pjones-keymap
Jack Humbert 1 year 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
48 48
 
49 49
 # things travis sees
50 50
 secrets.tar
51
-qmk.fm
52
-id_rsa_qmk_firmware
51
+id_rsa_*

BIN
secrets.tar.enc View File


+ 2
- 2
tmk_core/rules.mk View File

@@ -247,8 +247,8 @@ gccversion :
247 247
 	$(eval CMD=$(HEX) $< $@)
248 248
 	@$(BUILD_CMD)
249 249
 	@if $(AUTOGEN); then \
250
-		$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(KEYBOARD)_$(KEYMAP).hex\n"; \
251
-		$(COPY) $@ $(KEYMAP_PATH)/$(KEYBOARD)_$(KEYMAP).hex; \
250
+		$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(TARGET).hex\n"; \
251
+		$(COPY) $@ $(KEYMAP_PATH)/$(TARGET).hex; \
252 252
 	else \
253 253
 		$(COPY) $@ $(TARGET).hex; \
254 254
 	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
13 13
 tar xvf secrets.tar
14 14
 
15 15
 chmod 600 id_rsa_qmk_firmware
16
-chmod 600 qmk.fm
16
+chmod 600 id_rsa_qmk.fm
17 17
 eval `ssh-agent -s`
18 18
 ssh-add id_rsa_qmk_firmware
19 19
 
@@ -51,10 +51,10 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
51 51
 	cd ..
52 52
 	git clone git@github.com:qmk/qmk.fm.git
53 53
 	cd qmk.fm
54
-	mv ../qmk_firmware/qmk.fm qmk.fm
54
+	mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
55 55
 	ssh-add -D
56 56
 	eval `ssh-agent -s`
57
-	ssh-add qmk.fm
57
+	ssh-add id_rsa_qmk.fm
58 58
 	#git submodule update --init --recursive
59 59
 	#rm -rf keyboard
60 60
 	#rm -rf keyboards

Loading…
Cancel
Save