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.

34 lines
740 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@v3
  12. with:
  13. token: ${{ secrets.QMK_BOT_TOKEN }}
  14. fetch-depth: 0
  15. - name: Disable automatic eol conversion
  16. run: |
  17. echo "* -text" > .git/info/attributes
  18. - name: Checkout develop
  19. run: |
  20. git fetch origin master develop
  21. git checkout develop
  22. - name: Update develop from master
  23. run: |
  24. git config --global user.name "QMK Bot"
  25. git config --global user.email "hello@qmk.fm"
  26. git merge origin/master
  27. git push origin develop