drashna/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve diagnostics for build hashes

Browse Source
This commit is contained in:
Yan-Fa Li 2018-12-25 16:40:53 -08:00 committed by Drashna Jaelre
parent 8e0444618f
commit ee1be3e5b5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -19,6 +19,7 @@ install:
before_script: before_script:
- avr-gcc --version - avr-gcc --version
script: script:
- git rev-parse --short HEAD
- make test:all AUTOGEN=false - make test:all AUTOGEN=false
- bash util/travis_build.sh - bash util/travis_build.sh
- bash util/travis_docs.sh - bash util/travis_docs.sh
@ -33,7 +34,7 @@ addons:
- diffutils - diffutils
- dos2unix - dos2unix
- doxygen - doxygen
after_success: after_success:
bash util/travis_compiled_push.sh bash util/travis_compiled_push.sh
notifications: notifications:
webhooks: webhooks:

7
util/travis_compiled_push.sh
View File

@ -8,6 +8,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
set -o errexit -o nounset set -o errexit -o nounset
rev=$(git rev-parse --short HEAD) rev=$(git rev-parse --short HEAD)
echo "Using git hash ${rev}"
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
@ -34,7 +35,7 @@ increment_version ()
part[2]=$((part[2] + 1)) part[2]=$((part[2] + 1))
new="${part[*]}" new="${part[*]}"
echo -e "${new// /.}" echo -e "${new// /.}"
} }
git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
@ -63,7 +64,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
ssh-add -D ssh-add -D
eval `ssh-agent -s` eval `ssh-agent -s`
ssh-add id_rsa_qmk.fm ssh-add id_rsa_qmk.fm
# don't delete files in case not all keyboards are built # don't delete files in case not all keyboards are built
# rm -f compiled/*.hex # 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 for file in ../qmk_firmware/keyboards/*/*/*/*/keymaps/*/*_default.hex; do mv -v "$file" "compiled/${file##*/}" || true; done
bash _util/generate_keyboard_page.sh bash _util/generate_keyboard_page.sh
git add -A 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 git push git@github.com:qmk/qmk.fm.git
fi fi