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 7ff4060ab7..6cfc9e067e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ install:  before_script:    - avr-gcc --version  script: +- git rev-parse --short HEAD  - make test:all AUTOGEN=false  - bash util/travis_build.sh  - bash util/travis_docs.sh @@ -33,7 +34,7 @@ addons:      - diffutils      - dos2unix      - doxygen -after_success:  +after_success:    bash util/travis_compiled_push.sh  notifications:    webhooks: diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index a49908c71e..66b3beb6ce 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}"  set -o errexit -o nounset  rev=$(git rev-parse --short HEAD) +echo "Using git hash ${rev}"  if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then @@ -34,7 +35,7 @@ increment_version ()    part[2]=$((part[2] + 1))    new="${part[*]}"    echo -e "${new// /.}" -}  +}  git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} @@ -63,7 +64,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 @@ -74,7 +75,7 @@ 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 [email protected]:qmk/qmk.fm.git  fi | 
