diff options
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | secrets.tar.enc | bin | 0 -> 10256 bytes | |||
-rw-r--r-- | util/qmk.fm.enc | bin | 3248 -> 0 bytes | |||
-rw-r--r-- | util/qmk_firmware.enc | bin | 3248 -> 0 bytes | |||
-rw-r--r-- | util/travis_build.sh | 2 | ||||
-rw-r--r-- | util/travis_compiled_push.sh | 6 |
6 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 6c26e4112..ab788317c 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -11,6 +11,8 @@ env: | |||
11 | - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= | 11 | - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= |
12 | before_install: | 12 | before_install: |
13 | - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz | 13 | - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz |
14 | - openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d | ||
15 | - tar xvf secrets.tar | ||
14 | install: | 16 | install: |
15 | - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz | 17 | - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz |
16 | - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin" | 18 | - 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 index 000000000..689ae3e89 --- /dev/null +++ b/secrets.tar.enc | |||
Binary files differ | |||
diff --git a/util/qmk.fm.enc b/util/qmk.fm.enc deleted file mode 100644 index d7aa46270..000000000 --- a/util/qmk.fm.enc +++ /dev/null | |||
Binary files differ | |||
diff --git a/util/qmk_firmware.enc b/util/qmk_firmware.enc deleted file mode 100644 index 1cd82ba86..000000000 --- a/util/qmk_firmware.enc +++ /dev/null | |||
Binary files differ | |||
diff --git a/util/travis_build.sh b/util/travis_build.sh index 6bafd1941..5b0951c6e 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh | |||
@@ -5,7 +5,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" | |||
5 | 5 | ||
6 | if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | 6 | if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then |
7 | exit_code=0 | 7 | exit_code=0 |
8 | NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) | 8 | NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) |
9 | if [[ $NEFM -gt 0 ]] ; then | 9 | if [[ $NEFM -gt 0 ]] ; then |
10 | echo "Making all keymaps for all keyboards" | 10 | echo "Making all keymaps for all keyboards" |
11 | make all-keyboards AUTOGEN="true" | 11 | make all-keyboards AUTOGEN="true" |
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index dcf408a2e..a5bbe70ec 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
@@ -7,12 +7,10 @@ rev=$(git rev-parse --short HEAD) | |||
7 | git config --global user.name "Travis CI" | 7 | git config --global user.name "Travis CI" |
8 | git config --global user.email "jack.humb+travis.ci@gmail.com" | 8 | git config --global user.email "jack.humb+travis.ci@gmail.com" |
9 | 9 | ||
10 | openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk_firmware.enc -out qmk_firmware -d | 10 | chmod 600 id_rsa_qmk_firmware |
11 | openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk.fm.enc -out qmk.fm -d | ||
12 | chmod 600 qmk_firmware | ||
13 | chmod 600 qmk.fm | 11 | chmod 600 qmk.fm |
14 | eval `ssh-agent -s` | 12 | eval `ssh-agent -s` |
15 | ssh-add qmk_firmware | 13 | ssh-add id_rsa_qmk_firmware |
16 | ssh-add qmk.fm | 14 | ssh-add qmk.fm |
17 | 15 | ||
18 | if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then | 16 | if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then |