diff options
Diffstat (limited to 'util/travis_compiled_push.sh')
| -rw-r--r-- | util/travis_compiled_push.sh | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index dcf408a2e9..2f5f74f93e 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -4,18 +4,18 @@ set -o errexit -o nounset rev=$(git rev-parse --short HEAD) +if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then + 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 +openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d +tar xvf secrets.tar + +chmod 600 id_rsa_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 +ssh-add id_rsa_qmk_firmware increment_version () { @@ -32,7 +32,7 @@ if [[ $NEFM -gt 0 ]] ; then 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 + git push --tags git@github.com:qmk/qmk_firmware.git else echo "No essential files modified." fi @@ -44,6 +44,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then cd .. git clone git@github.com:qmk/qmk.fm.git cd qmk.fm + ssh-add ../qmk_firmware/qmk.fm #git submodule update --init --recursive #rm -rf keyboard #rm -rf keyboards @@ -57,7 +58,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then git add -A git commit -m "generated from qmk/qmk_firmware@${rev}" - git push + git push git@github.com:qmk/qmk.fm.git fi |