36 lines
692 B
YAML
36 lines
692 B
YAML
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
|
|
id: check_locked
|
|
uses: andstor/file-existence-action@v1
|
|
with:
|
|
files: ".locked"
|
|
|
|
- name: Update develop from master
|
|
if: steps.check_locked.outputs.files_exists == 'false'
|
|
run: |
|
|
git merge origin/master
|
|
git push origin develop
|