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
772 B

  1. name: Update develop after master merge
  2. permissions:
  3. contents: write
  4. on:
  5. push:
  6. branches:
  7. - master
  8. jobs:
  9. develop_update:
  10. runs-on: ubuntu-latest
  11. if: github.repository == 'qmk/qmk_firmware'
  12. steps:
  13. - uses: actions/checkout@v3
  14. with:
  15. token: ${{ secrets.QMK_BOT_TOKEN }}
  16. fetch-depth: 0
  17. - name: Disable automatic eol conversion
  18. run: |
  19. echo "* -text" > .git/info/attributes
  20. - name: Checkout develop
  21. run: |
  22. git fetch origin master develop
  23. git checkout develop
  24. - name: Update develop from master
  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