You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

89 lines
2.7 KiB

Implements subprojects and updates projects for this (#459) * non-working commit * working * subprojects implemented for planck * pass a subproject variable through to c * consolidates clueboard revisions * thanks for letting me know about conflicts.. * turn off audio for yang's * corrects starting paths for subprojects * messing around with travis * semicolon * travis script * travis script * script for travis * correct directory (probably), amend files to commit * remove origin before adding * git pull, correct syntax * git checkout * git pull origin branch * where are we? * where are we? * merging * force things to happen * adds commit message, adds add * rebase, no commit message * rebase branch * idk! * try just pull * fetch - merge * specify repo branch * checkout * goddammit * merge? idk * pls * after all * don't split up keyboards * syntax * adds quick for all-keyboards * trying out new script * script update * lowercase * all keyboards * stop replacing compiled.hex automatically * adds if statement * skip automated build branches * forces push to automated build branch * throw an add in there * upstream? * adds AUTOGEN * ignore all .hex files again * testing out new repo * global ident * generate script, keyboard_keymap.hex * skip generation for now, print pandoc info, submodule update * try trusty * and sudo * try generate * updates subprojects to keyboards * no idea * updates to keyboards * cleans up clueboard stuff * setup to use local readme * updates cluepad, planck experimental * remove extra led.c [ci skip] * disable power up for now * config files updates * makefile updates * .h file updates, config tuning * disable audio for yang
8 years ago
Implements subprojects and updates projects for this (#459) * non-working commit * working * subprojects implemented for planck * pass a subproject variable through to c * consolidates clueboard revisions * thanks for letting me know about conflicts.. * turn off audio for yang's * corrects starting paths for subprojects * messing around with travis * semicolon * travis script * travis script * script for travis * correct directory (probably), amend files to commit * remove origin before adding * git pull, correct syntax * git checkout * git pull origin branch * where are we? * where are we? * merging * force things to happen * adds commit message, adds add * rebase, no commit message * rebase branch * idk! * try just pull * fetch - merge * specify repo branch * checkout * goddammit * merge? idk * pls * after all * don't split up keyboards * syntax * adds quick for all-keyboards * trying out new script * script update * lowercase * all keyboards * stop replacing compiled.hex automatically * adds if statement * skip automated build branches * forces push to automated build branch * throw an add in there * upstream? * adds AUTOGEN * ignore all .hex files again * testing out new repo * global ident * generate script, keyboard_keymap.hex * skip generation for now, print pandoc info, submodule update * try trusty * and sudo * try generate * updates subprojects to keyboards * no idea * updates to keyboards * cleans up clueboard stuff * setup to use local readme * updates cluepad, planck experimental * remove extra led.c [ci skip] * disable power up for now * config files updates * makefile updates * .h file updates, config tuning * disable audio for yang
8 years ago
Implements subprojects and updates projects for this (#459) * non-working commit * working * subprojects implemented for planck * pass a subproject variable through to c * consolidates clueboard revisions * thanks for letting me know about conflicts.. * turn off audio for yang's * corrects starting paths for subprojects * messing around with travis * semicolon * travis script * travis script * script for travis * correct directory (probably), amend files to commit * remove origin before adding * git pull, correct syntax * git checkout * git pull origin branch * where are we? * where are we? * merging * force things to happen * adds commit message, adds add * rebase, no commit message * rebase branch * idk! * try just pull * fetch - merge * specify repo branch * checkout * goddammit * merge? idk * pls * after all * don't split up keyboards * syntax * adds quick for all-keyboards * trying out new script * script update * lowercase * all keyboards * stop replacing compiled.hex automatically * adds if statement * skip automated build branches * forces push to automated build branch * throw an add in there * upstream? * adds AUTOGEN * ignore all .hex files again * testing out new repo * global ident * generate script, keyboard_keymap.hex * skip generation for now, print pandoc info, submodule update * try trusty * and sudo * try generate * updates subprojects to keyboards * no idea * updates to keyboards * cleans up clueboard stuff * setup to use local readme * updates cluepad, planck experimental * remove extra led.c [ci skip] * disable power up for now * config files updates * makefile updates * .h file updates, config tuning * disable audio for yang
8 years ago
6 years ago
7 years ago
  1. #!/bin/bash
  2. source util/travis_push.sh
  3. set -o errexit -o nounset
  4. rev=$(git rev-parse --short HEAD)
  5. echo "Using git hash ${rev}"
  6. if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
  7. # fix formatting
  8. git checkout master
  9. git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
  10. git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | grep -v 'quantum/template' | xargs -0 clang-format
  11. git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
  12. git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master
  13. increment_version ()
  14. {
  15. declare -a part=( ${1//\./ } )
  16. part[2]=$((part[2] + 1))
  17. new="${part[*]}"
  18. echo -e "${new// /.}"
  19. }
  20. git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
  21. NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(users/)' | grep -Ev '^(layouts/)' | wc -l)
  22. if [[ $NEFM -gt 0 ]] ; then
  23. echo "Essential files modified."
  24. git fetch --tags
  25. lasttag=$(git tag --sort=-creatordate --no-column --list '*.*.*' | grep -E -m1 '^[0-9]+\.[0-9]+\.[0-9]+$')
  26. newtag=$(increment_version $lasttag)
  27. until git tag $newtag; do
  28. newtag=$(increment_version $newtag)
  29. done
  30. git push --tags git@github.com:qmk/qmk_firmware.git
  31. else
  32. echo "No essential files modified."
  33. fi
  34. if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
  35. make generate-keyboards-file SILENT=true > .keyboards
  36. cd ..
  37. git clone git@github.com:qmk/qmk.fm.git
  38. cd qmk.fm
  39. mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
  40. mv ../qmk_firmware/.keyboards .
  41. ssh-add -D
  42. eval `ssh-agent -s`
  43. ssh-add id_rsa_qmk.fm
  44. # don't delete files in case not all keyboards are built
  45. # rm -f compiled/*.hex
  46. # ignore errors here
  47. # In theory, this is more flexible, and will allow for additional expansion of additional types of files and other names
  48. mv ../qmk_firmware/*_default.*{hex,bin} ./compiled/ || true
  49. # get the list of keyboards
  50. readarray -t keyboards < .keyboards
  51. # replace / with _
  52. keyboards=("${keyboards[@]//[\/]/_}")
  53. # remove all binaries that don't belong to a keyboard in .keyboards
  54. for file in "./compiled"/* ; do
  55. match=0
  56. for keyboard in "${keyboards[@]}" ; do
  57. if [[ ${file##*/} = "${keyboard}_default.bin" ]] || [[ ${file##*/} = "${keyboard}_default.hex" ]]; then
  58. match=1
  59. break
  60. fi
  61. done
  62. if [[ $match = 0 ]]; then
  63. echo "Removing deprecated binary: $file"
  64. rm "$file"
  65. fi
  66. done
  67. bash _util/generate_keyboard_page.sh
  68. git add -A
  69. git commit -m "generated from qmk/qmk_firmware@${rev}"
  70. git push git@github.com:qmk/qmk.fm.git
  71. fi
  72. fi