mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-26 05:06:42 +00:00
46e85ded47
* Add merge workflow for XAP branch * uncomment
35 lines
708 B
YAML
35 lines
708 B
YAML
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 }}
|