summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-05-28 16:16:56 -0400
committerJack Humbert <jack.humb@gmail.com>2017-05-28 16:16:56 -0400
commit71feac57175f5a3d09e96cc579f5d5c3477adb7b (patch)
tree96701c9fc3a28f3d2f40673a85d9c42973b35d9e
parentde0a058da7cf1ccbc27773af237520928e95efbb (diff)
ignore docs, fix tag/hex pushing
-rw-r--r--util/qmk.fm.encbin0 -> 3248 bytes
-rw-r--r--util/qmk_firmware.encbin0 -> 3248 bytes
-rw-r--r--util/travis_compiled_push.sh14
3 files changed, 11 insertions, 3 deletions
diff --git a/util/qmk.fm.enc b/util/qmk.fm.enc
new file mode 100644
index 0000000000..d7aa462703
--- /dev/null
+++ b/util/qmk.fm.enc
Binary files differ
diff --git a/util/qmk_firmware.enc b/util/qmk_firmware.enc
new file mode 100644
index 0000000000..1cd82ba86d
--- /dev/null
+++ b/util/qmk_firmware.enc
Binary files differ
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