diff options
Diffstat (limited to 'util/travis_compiled_push.sh')
-rw-r--r-- | util/travis_compiled_push.sh | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index b3554b507..6be124122 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
@@ -1,26 +1,13 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | 2 | ||
3 | TRAVIS_BRANCH="${TRAVIS_BRANCH:master}" | ||
4 | TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}" | ||
5 | TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}" | ||
6 | TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" | ||
7 | |||
8 | set -o errexit -o nounset | 3 | set -o errexit -o nounset |
9 | 4 | ||
5 | source util/travis_push.sh | ||
10 | rev=$(git rev-parse --short HEAD) | 6 | rev=$(git rev-parse --short HEAD) |
11 | 7 | ||
12 | if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then | 8 | if ! [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then |
13 | 9 | exit 0 | |
14 | git config --global user.name "QMK Bot" | 10 | fi |
15 | git config --global user.email "hello@qmk.fm" | ||
16 | |||
17 | openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d | ||
18 | tar xvf secrets.tar | ||
19 | |||
20 | chmod 600 id_rsa_qmk_firmware | ||
21 | chmod 600 id_rsa_qmk.fm | ||
22 | eval `ssh-agent -s` | ||
23 | ssh-add id_rsa_qmk_firmware | ||
24 | 11 | ||
25 | # convert to unix line-endings | 12 | # convert to unix line-endings |
26 | git checkout master | 13 | git checkout master |
@@ -28,12 +15,11 @@ git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 d | |||
28 | git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add | 15 | git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add |
29 | git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master | 16 | git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master |
30 | 17 | ||
31 | increment_version () | 18 | increment_version () { |
32 | { | 19 | declare -a part=( ${1//\./ } ) |
33 | declare -a part=( ${1//\./ } ) | 20 | part[2]=$((part[2] + 1)) |
34 | part[2]=$((part[2] + 1)) | 21 | new="${part[*]}" |
35 | new="${part[*]}" | 22 | echo -e "${new// /.}" |
36 | echo -e "${new// /.}" | ||
37 | } | 23 | } |
38 | 24 | ||
39 | git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | 25 | git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} |
@@ -76,7 +62,4 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | |||
76 | git add -A | 62 | git add -A |
77 | git commit -m "generated from qmk/qmk_firmware@${rev}" | 63 | git commit -m "generated from qmk/qmk_firmware@${rev}" |
78 | git push git@github.com:qmk/qmk.fm.git | 64 | git push git@github.com:qmk/qmk.fm.git |
79 | |||
80 | fi | 65 | fi |
81 | |||
82 | fi \ No newline at end of file | ||