mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-12 21:00:58 +00:00
f75ac6042e
Co-authored-by: Joel Challis <git@zvecr.com>
38 lines
772 B
YAML
38 lines
772 B
YAML
name: Update develop after master merge
|
|
|
|
permissions:
|
|
contents: write
|
|
|
|
on:
|
|
push:
|
|
branches:
|
|
- master
|
|
|
|
jobs:
|
|
develop_update:
|
|
runs-on: ubuntu-latest
|
|
|
|
if: github.repository == 'qmk/qmk_firmware'
|
|
|
|
steps:
|
|
- uses: actions/checkout@v3
|
|
with:
|
|
token: ${{ secrets.QMK_BOT_TOKEN }}
|
|
fetch-depth: 0
|
|
|
|
- name: Disable automatic eol conversion
|
|
run: |
|
|
echo "* -text" > .git/info/attributes
|
|
|
|
- name: Checkout develop
|
|
run: |
|
|
git fetch origin master develop
|
|
git checkout develop
|
|
|
|
- name: Update develop from master
|
|
run: |
|
|
git config --global user.name "QMK Bot"
|
|
git config --global user.email "hello@qmk.fm"
|
|
git merge origin/master
|
|
git push origin develop
|