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.

37 lines
794 B

  1. name: Update develop after master merge
  2. on:
  3. push:
  4. branches:
  5. - master
  6. jobs:
  7. develop_update:
  8. runs-on: ubuntu-latest
  9. if: github.repository == 'qmk/qmk_firmware'
  10. steps:
  11. - uses: actions/checkout@v2
  12. with:
  13. fetch-depth: 0
  14. - name: Checkout develop
  15. run: |
  16. git fetch origin master develop
  17. git checkout develop
  18. - name: Check if branch locked
  19. id: check_locked
  20. uses: andstor/file-existence-action@v1
  21. with:
  22. files: ".locked"
  23. - name: Update develop from master
  24. if: steps.check_locked.outputs.files_exists == 'false'
  25. run: |
  26. git config --global user.name "QMK Bot"
  27. git config --global user.email "hello@qmk.fm"
  28. git merge origin/master
  29. git push origin develop