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.

68 lines
1.9 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
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
7 years ago
7 years ago
  1. #!/bin/bash
  2. set -o errexit -o nounset
  3. rev=$(git rev-parse --short HEAD)
  4. if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
  5. git config --global user.name "QMK Bot"
  6. git config --global user.email "hello@qmk.fm"
  7. openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in secrets.tar.enc -out secrets.tar -d
  8. tar xvf secrets.tar
  9. chmod 600 id_rsa_qmk_firmware
  10. chmod 600 qmk.fm
  11. eval `ssh-agent -s`
  12. ssh-add id_rsa_qmk_firmware
  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/)' | wc -l)
  22. if [[ $NEFM -gt 0 ]] ; then
  23. echo "Essential files modified."
  24. git fetch --tags
  25. lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
  26. newtag=$(increment_version $lasttag)
  27. git tag $newtag
  28. git push --tags git@github.com:qmk/qmk_firmware.git
  29. else
  30. echo "No essential files modified."
  31. fi
  32. if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
  33. make ergodox-ez AUTOGEN=true
  34. cd ..
  35. git clone git@github.com:qmk/qmk.fm.git
  36. cd qmk.fm
  37. mv ../qmk_firmware/qmk.fm qmk.fm
  38. ssh-add qmk.fm
  39. #git submodule update --init --recursive
  40. #rm -rf keyboard
  41. #rm -rf keyboards
  42. #yes | cp -rf ../qmk_firmware/keyboards .
  43. #mkdir keyboards/ergodox_ez/
  44. #cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
  45. #cp ../qmk_firmware/readme.md qmk_readme.md
  46. #./generate.sh
  47. rm -f _compiled/*.hex
  48. for file in ../qmk_firmware/keyboards/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
  49. for file in ../qmk_firmware/keyboards/*/*/keymaps/*/*.hex; do mv -v "$file" "_compiled/${file##*/}"; done
  50. git add -A
  51. git commit -m "generated from qmk/qmk_firmware@${rev}"
  52. git push git@github.com:qmk/qmk.fm.git
  53. fi
  54. fi