From ae6b803ad61d647febbfe806d795b8b757fce074 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Mon, 29 May 2017 10:54:46 -0400
Subject: more than one en-file, and actually ignore docs
---
util/qmk.fm.enc | Bin 3248 -> 0 bytes
util/qmk_firmware.enc | Bin 3248 -> 0 bytes
util/travis_build.sh | 2 +-
util/travis_compiled_push.sh | 6 ++----
4 files changed, 3 insertions(+), 5 deletions(-)
delete mode 100644 util/qmk.fm.enc
delete mode 100644 util/qmk_firmware.enc
(limited to 'util')
diff --git a/util/qmk.fm.enc b/util/qmk.fm.enc
deleted file mode 100644
index d7aa462703..0000000000
Binary files a/util/qmk.fm.enc and /dev/null differ
diff --git a/util/qmk_firmware.enc b/util/qmk_firmware.enc
deleted file mode 100644
index 1cd82ba86d..0000000000
Binary files a/util/qmk_firmware.enc and /dev/null differ
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 6bafd1941f..5b0951c6e0 100644
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -5,7 +5,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
exit_code=0
- NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
+ NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l)
if [[ $NEFM -gt 0 ]] ; then
echo "Making all keymaps for all keyboards"
make all-keyboards AUTOGEN="true"
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index dcf408a2e9..a5bbe70ece 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -7,12 +7,10 @@ rev=$(git rev-parse --short HEAD)
git config --global user.name "Travis CI"
git config --global user.email "jack.humb+travis.ci@gmail.com"
-openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk_firmware.enc -out qmk_firmware -d
-openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk.fm.enc -out qmk.fm -d
-chmod 600 qmk_firmware
+chmod 600 id_rsa_qmk_firmware
chmod 600 qmk.fm
eval `ssh-agent -s`
-ssh-add qmk_firmware
+ssh-add id_rsa_qmk_firmware
ssh-add qmk.fm
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
--
cgit v1.2.3