From 71feac57175f5a3d09e96cc579f5d5c3477adb7b Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sun, 28 May 2017 16:16:56 -0400 Subject: [PATCH] ignore docs, fix tag/hex pushing --- util/qmk.fm.enc | Bin 0 -> 3248 bytes util/qmk_firmware.enc | Bin 0 -> 3248 bytes util/travis_compiled_push.sh | 14 +++++++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 util/qmk.fm.enc create mode 100644 util/qmk_firmware.enc diff --git a/util/qmk.fm.enc b/util/qmk.fm.enc new file mode 100644 index 0000000000000000000000000000000000000000..d7aa4627037118fe98d85ea8669562bf20465bad GIT binary patch literal 3248 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 CIA6j5 literal 0 HcmV?d00001 diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 718daaa295..dcf408a2e9 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -7,6 +7,14 @@ 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 qmk.fm +eval `ssh-agent -s` +ssh-add qmk_firmware +ssh-add qmk.fm + if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then increment_version () @@ -17,14 +25,14 @@ increment_version () echo -e "${new// /.}" } -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 "Essential files modified." git fetch --tags lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1) newtag=$(increment_version $lasttag) git tag $newtag - git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware + git push --tags else echo "No essential files modified." fi @@ -34,7 +42,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then make ergodox-ez AUTOGEN=true cd .. - git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git + git clone git@github.com:qmk/qmk.fm.git cd qmk.fm #git submodule update --init --recursive #rm -rf keyboard