Add merge workflow for XAP branch (#16652)
* Add merge workflow for XAP branch * uncomment
This commit is contained in:
parent
e9bf95e0f2
commit
46e85ded47
2 changed files with 34 additions and 8 deletions
8
.github/workflows/develop_update.yml
vendored
8
.github/workflows/develop_update.yml
vendored
|
@ -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"
|
||||||
|
|
34
.github/workflows/feature_branch_update.yml
vendored
Normal file
34
.github/workflows/feature_branch_update.yml
vendored
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
name: Update feature branches after develop merge
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- develop
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
feature_branch_update:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
if: github.repository == 'qmk/qmk_firmware'
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
branch:
|
||||||
|
- xap
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Checkout branch
|
||||||
|
run: |
|
||||||
|
git fetch origin develop ${{ matrix.branch }}
|
||||||
|
git checkout ${{ matrix.branch }}
|
||||||
|
|
||||||
|
- name: Update branch from develop
|
||||||
|
run: |
|
||||||
|
git config --global user.name "QMK Bot"
|
||||||
|
git config --global user.email "hello@qmk.fm"
|
||||||
|
git merge origin/develop
|
||||||
|
git push origin ${{ matrix.branch }}
|
Loading…
Reference in a new issue