ignore docs, fix tag/hex pushing

diff --git a/util/qmk.fm.enc b/util/qmk.fm.enc
new file mode 100644 (file)
index 0000000..d7aa462
Binary files /dev/null and b/util/qmk.fm.enc differ

diff --git a/util/qmk_firmware.enc b/util/qmk_firmware.enc
new file mode 100644 (file)
index 0000000..1cd82ba
Binary files /dev/null and b/util/qmk_firmware.enc differ

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 718daaa295637ac8ebd65c623fd0ff3b44172c58..dcf408a2e952d190dff345edf9ebbf9042d57aef 100644 (file)
--- 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