diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | util/travis_compiled_push.sh | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 7ff4060ab..6cfc9e067 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -19,6 +19,7 @@ install: | |||
| 19 | before_script: | 19 | before_script: |
| 20 | - avr-gcc --version | 20 | - avr-gcc --version |
| 21 | script: | 21 | script: |
| 22 | - git rev-parse --short HEAD | ||
| 22 | - make test:all AUTOGEN=false | 23 | - make test:all AUTOGEN=false |
| 23 | - bash util/travis_build.sh | 24 | - bash util/travis_build.sh |
| 24 | - bash util/travis_docs.sh | 25 | - bash util/travis_docs.sh |
| @@ -33,7 +34,7 @@ addons: | |||
| 33 | - diffutils | 34 | - diffutils |
| 34 | - dos2unix | 35 | - dos2unix |
| 35 | - doxygen | 36 | - doxygen |
| 36 | after_success: | 37 | after_success: |
| 37 | bash util/travis_compiled_push.sh | 38 | bash util/travis_compiled_push.sh |
| 38 | notifications: | 39 | notifications: |
| 39 | webhooks: | 40 | webhooks: |
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index a49908c71..66b3beb6c 100755 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
| @@ -8,6 +8,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}" | |||
| 8 | set -o errexit -o nounset | 8 | set -o errexit -o nounset |
| 9 | 9 | ||
| 10 | rev=$(git rev-parse --short HEAD) | 10 | rev=$(git rev-parse --short HEAD) |
| 11 | echo "Using git hash ${rev}" | ||
| 11 | 12 | ||
| 12 | if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then | 13 | if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then |
| 13 | 14 | ||
| @@ -34,7 +35,7 @@ increment_version () | |||
| 34 | part[2]=$((part[2] + 1)) | 35 | part[2]=$((part[2] + 1)) |
| 35 | new="${part[*]}" | 36 | new="${part[*]}" |
| 36 | echo -e "${new// /.}" | 37 | echo -e "${new// /.}" |
| 37 | } | 38 | } |
| 38 | 39 | ||
| 39 | git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | 40 | git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} |
| 40 | 41 | ||
| @@ -63,7 +64,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | |||
| 63 | ssh-add -D | 64 | ssh-add -D |
| 64 | eval `ssh-agent -s` | 65 | eval `ssh-agent -s` |
| 65 | ssh-add id_rsa_qmk.fm | 66 | ssh-add id_rsa_qmk.fm |
| 66 | 67 | ||
| 67 | # don't delete files in case not all keyboards are built | 68 | # don't delete files in case not all keyboards are built |
| 68 | # rm -f compiled/*.hex | 69 | # rm -f compiled/*.hex |
| 69 | 70 | ||
| @@ -74,7 +75,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then | |||
| 74 | for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done | 75 | for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done |
| 75 | bash _util/generate_keyboard_page.sh | 76 | bash _util/generate_keyboard_page.sh |
| 76 | git add -A | 77 | git add -A |
| 77 | git commit -m "generated from qmk/qmk_firmware@${rev}" | 78 | git commit -m "generated from qmk/qmk_firmware@${rev}" |
| 78 | git push git@github.com:qmk/qmk.fm.git | 79 | git push git@github.com:qmk/qmk.fm.git |
| 79 | 80 | ||
| 80 | fi | 81 | fi |
