Rebase develop after a master push (#10812)
* rebase develop after a master push * limit this to qmk/qmk_firmware * change to a merge strategy * GITHUB_TOKEN isn't needed * check for .locked in develop * break up into more steps
This commit is contained in:
parent
95fd2ce81a
commit
8ddbb19df1
1 changed files with 32 additions and 0 deletions
32
.github/workflows/develop_update.yml
vendored
Normal file
32
.github/workflows/develop_update.yml
vendored
Normal file
|
@ -0,0 +1,32 @@
|
|||
name: Update develop after master merge
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
|
||||
jobs:
|
||||
develop_update:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
if: github.repository == 'qmk/qmk_firmware'
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Checkout develop
|
||||
run: |
|
||||
git fetch origin master develop
|
||||
git checkout develop
|
||||
|
||||
- name: Check if branch locked
|
||||
run: |
|
||||
test -e .locked || exit 1
|
||||
|
||||
- name: Update develop from master
|
||||
run: |
|
||||
git merge origin/master
|
||||
git push origin develop
|
Loading…
Reference in a new issue