at master 37 lines 772 B view raw
1name: Update develop after master merge 2 3permissions: 4 contents: write 5 6on: 7 push: 8 branches: 9 - master 10 11jobs: 12 develop_update: 13 runs-on: ubuntu-latest 14 15 if: github.repository == 'qmk/qmk_firmware' 16 17 steps: 18 - uses: actions/checkout@v6 19 with: 20 token: ${{ secrets.QMK_BOT_TOKEN }} 21 fetch-depth: 0 22 23 - name: Disable automatic eol conversion 24 run: | 25 echo "* -text" > .git/info/attributes 26 27 - name: Checkout develop 28 run: | 29 git fetch origin master develop 30 git checkout develop 31 32 - name: Update develop from master 33 run: | 34 git config --global user.name "QMK Bot" 35 git config --global user.email "hello@qmk.fm" 36 git merge origin/master 37 git push origin develop