Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Add merge workflow for XAP branch (#16652)

Browse source 
* Add merge workflow for XAP branch

* uncomment
This commit is contained in:
Joel Challis 2022-03-15 12:49:23 +00:00 • committed by GitHub
parent e9bf95e0f2
commit 46e85ded47
Failed to generate hash of commit
2 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/develop_update.yml vendored
View file

@ -5,7 +5,6 @@ on:
branches:
- master
jobs:
develop_update:
runs-on: ubuntu-latest
@ -22,14 +21,7 @@ jobs:
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 config --global user.name "QMK Bot"
git config --global user.email "hello@qmk.fm"