2022-03-15 13:49:23 +01:00
|
|
|
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:
|
2022-06-29 08:44:54 +02:00
|
|
|
- uses: actions/checkout@v3
|
2022-03-15 13:49:23 +01:00
|
|
|
with:
|
2022-03-16 00:27:55 +01:00
|
|
|
token: ${{ secrets.QMK_BOT_TOKEN }}
|
2022-03-15 13:49:23 +01:00
|
|
|
fetch-depth: 0
|
|
|
|
|
2022-08-08 20:05:41 +02:00
|
|
|
- name: Disable automatic eol conversion
|
|
|
|
run: |
|
|
|
|
echo "* -text" > .git/info/attributes
|
|
|
|
|
2022-03-15 13:49:23 +01:00
|
|
|
- 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 }}
|