diff options
| author | Zach White <skullydazed@gmail.com> | 2020-11-21 11:48:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 11:48:13 -0800 |
| commit | 8ddbb19df1e96246d9e1f7fdcae9ebfe8e0f3118 (patch) | |
| tree | 3408cb2dc16903395b263c1560d80ea432f7cba4 /.github/workflows/develop_update.yml | |
| parent | 95fd2ce81a394d972d922b7be34a99752aed9e31 (diff) | |
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
Diffstat (limited to '.github/workflows/develop_update.yml')
| -rw-r--r-- | .github/workflows/develop_update.yml | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml new file mode 100644 index 0000000000..101d235e04 --- /dev/null +++ b/.github/workflows/develop_update.yml @@ -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 |