|
@ -5,7 +5,6 @@ on: |
|
|
branches: |
|
|
branches: |
|
|
- master |
|
|
- master |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
jobs: |
|
|
jobs: |
|
|
develop_update: |
|
|
develop_update: |
|
|
runs-on: ubuntu-latest |
|
|
runs-on: ubuntu-latest |
|
@ -22,14 +21,7 @@ jobs: |
|
|
git fetch origin master develop |
|
|
git fetch origin master develop |
|
|
git checkout 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 |
|
|
- name: Update develop from master |
|
|
if: steps.check_locked.outputs.files_exists == 'false' |
|
|
|
|
|
run: | |
|
|
run: | |
|
|
git config --global user.name "QMK Bot" |
|
|
git config --global user.name "QMK Bot" |
|
|
git config --global user.email "hello@qmk.fm" |
|
|
git config --global user.email "hello@qmk.fm" |
|
|