more than one en-file, and actually ignore docs
This commit is contained in:
parent
71feac5717
commit
ae6b803ad6
6 changed files with 5 additions and 5 deletions
BIN
util/qmk.fm.enc
BIN
util/qmk.fm.enc
Binary file not shown.
Binary file not shown.
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue