diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-05-29 16:54:46 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-05-29 16:54:46 +0200 |
| commit | ae6b803ad61d647febbfe806d795b8b757fce074 (patch) | |
| tree | 11cb38c78ff5c5cb04019336e4cf22991b0a74c6 /util | |
| parent | 71feac57175f5a3d09e96cc579f5d5c3477adb7b (diff) | |
| download | qmk_firmware-ae6b803ad61d647febbfe806d795b8b757fce074.tar.gz qmk_firmware-ae6b803ad61d647febbfe806d795b8b757fce074.tar.xz | |
more than one en-file, and actually ignore docs
Diffstat (limited to 'util')
| -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 |
4 files changed, 3 insertions, 5 deletions
diff --git a/util/qmk.fm.enc b/util/qmk.fm.enc Binary files differdeleted file mode 100644 index d7aa46270..000000000 --- a/util/qmk.fm.enc +++ /dev/null diff --git a/util/qmk_firmware.enc b/util/qmk_firmware.enc Binary files differdeleted file mode 100644 index 1cd82ba86..000000000 --- a/util/qmk_firmware.enc +++ /dev/null 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}" 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 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) 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 |