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.

82 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
7 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
7 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
7 years ago
6 years ago
6 years ago
7 years ago
  1. #!/bin/bash
  2. TRAVIS_BRANCH="${TRAVIS_BRANCH:master}"
  3. TRAVIS_PULL_REQUEST="${TRAVIS_PULL_REQUEST:false}"
  4. TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
  5. TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
  6. set -o errexit -o nounset
  7. rev=$(git rev-parse --short HEAD)
  8. echo "Using git hash ${rev}"
  9. if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
  10. git config --global user.name "QMK Bot"
  11. git config --global user.email "hello@qmk.fm"
  12. openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
  13. tar xvf secrets.tar
  14. chmod 600 id_rsa_qmk_firmware
  15. chmod 600 id_rsa_qmk.fm
  16. eval `ssh-agent -s`
  17. ssh-add id_rsa_qmk_firmware
  18. # convert to unix line-endings
  19. git checkout master
  20. git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
  21. git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
  22. git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master
  23. increment_version ()
  24. {
  25. declare -a part=( ${1//\./ } )
  26. part[2]=$((part[2] + 1))
  27. new="${part[*]}"
  28. echo -e "${new// /.}"
  29. }
  30. git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
  31. NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(users/)' | grep -Ev '^(layouts/)' | wc -l)
  32. if [[ $NEFM -gt 0 ]] ; then
  33. echo "Essential files modified."
  34. git fetch --tags
  35. #lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
  36. lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | sort -V | tail -1)
  37. newtag=$(increment_version $lasttag)
  38. until git tag $newtag; do
  39. newtag=$(increment_version $newtag)
  40. done
  41. git push --tags git@github.com:qmk/qmk_firmware.git
  42. else
  43. echo "No essential files modified."
  44. fi
  45. if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
  46. make generate-keyboards-file SILENT=true > .keyboards
  47. cd ..
  48. git clone git@github.com:qmk/qmk.fm.git
  49. cd qmk.fm
  50. mv ../qmk_firmware/id_rsa_qmk.fm id_rsa_qmk.fm
  51. mv ../qmk_firmware/.keyboards .
  52. ssh-add -D
  53. eval `ssh-agent -s`
  54. ssh-add id_rsa_qmk.fm
  55. # don't delete files in case not all keyboards are built
  56. # rm -f compiled/*.hex
  57. # ignore errors here
  58. # In theory, this is more flexible, and will allow for additional expansion of additional types of files and other names
  59. mv -t compiled ../qmk_firmware/*_default.*(hex|bin) || true
  60. bash _util/generate_keyboard_page.sh
  61. git add -A
  62. git commit -m "generated from qmk/qmk_firmware@${rev}"
  63. git push git@github.com:qmk/qmk.fm.git
  64. fi
  65. fi