diff options
| author | U-LANDSRAAD\drashna <drashna@live.com> | 2018-03-29 23:47:02 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-03-30 00:18:50 +0200 |
| commit | c31f7ff91b2a293995951a08979ef0f06fed111d (patch) | |
| tree | 21288bd1c9c02cf292a4096c99d260a477a508b0 | |
| parent | c2bec5b3f0149758f89ad6b84ea8781fde41fce1 (diff) | |
| download | qmk_firmware-c31f7ff91b2a293995951a08979ef0f06fed111d.tar.gz qmk_firmware-c31f7ff91b2a293995951a08979ef0f06fed111d.tar.xz | |
Hopefully fix Travis Auto-Incrementation
This reverts the changes in #2491, so that Travis will hopefully return to automatic incrementing.
But this includes the layout and userspace excepts, as well.
| -rw-r--r-- | util/travis_compiled_push.sh | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index ae2a74744..a49908c71 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -1,13 +1,26 @@ #!/bin/bash +TRAVIS_BRANCH="${TRAVIS_BRANCH:master}" +TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}" +TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" +TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" + set -o errexit -o nounset -source util/travis_push.sh rev=$(git rev-parse --short HEAD) -if ! [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then - exit 0 -fi +if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then + +git config --global user.name "QMK Bot" +git config --global user.email "hello@qmk.fm" + +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 id_rsa_qmk.fm +eval `ssh-agent -s` +ssh-add id_rsa_qmk_firmware # convert to unix line-endings git checkout master @@ -15,12 +28,13 @@ git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 d git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master -increment_version () { - declare -a part=( ${1//\./ } ) - part[2]=$((part[2] + 1)) - new="${part[*]}" - echo -e "${new// /.}" -} +increment_version () +{ + declare -a part=( ${1//\./ } ) + part[2]=$((part[2] + 1)) + new="${part[*]}" + echo -e "${new// /.}" +} git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} @@ -49,7 +63,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then ssh-add -D eval `ssh-agent -s` ssh-add id_rsa_qmk.fm - + # don't delete files in case not all keyboards are built # rm -f compiled/*.hex @@ -60,6 +74,9 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done bash _util/generate_keyboard_page.sh git add -A - git commit -m "generated from qmk/qmk_firmware@${rev}" + git commit -m "generated from qmk/qmk_firmware@${rev}" git push git@github.com:qmk/qmk.fm.git + +fi + fi |