more than one en-file, and actually ignore docs

diff --git a/.travis.yml b/.travis.yml
index 6c26e411286d8d77482983aad8572e68da754617..ab788317c89f8644687120f3edb32c45eafbe1a0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ env:
   - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
 before_install:
   - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
+  - openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
+  - tar xvf secrets.tar
 install:
   - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
   - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin"

diff --git a/secrets.tar.enc b/secrets.tar.enc
new file mode 100644 (file)
index 0000000..689ae3e
Binary files /dev/null and b/secrets.tar.enc differ

diff --git a/util/qmk.fm.enc b/util/qmk.fm.enc
deleted file mode 100644 (file)
index d7aa462..0000000
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 (file)
index 1cd82ba..0000000
Binary files a/util/qmk_firmware.enc and /dev/null differ

diff --git a/util/travis_build.sh b/util/travis_build.sh
index 6bafd1941f0a620dc786bfdb376017a22b6834d9..5b0951c6e0b978975b80572424957b3f652dd7ae 100644 (file)
--- 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 dcf408a2e952d190dff345edf9ebbf9042d57aef..a5bbe70ece4528596517b821a4a29e7d0d4ce29d 100644 (file)
--- 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