549708edfa
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
44 lines
904 B
YAML
44 lines
904 B
YAML
name: Update feature branches after develop merge
|
|
|
|
permissions:
|
|
contents: write
|
|
|
|
on:
|
|
push:
|
|
branches:
|
|
- develop
|
|
|
|
jobs:
|
|
feature_branch_update:
|
|
runs-on: ubuntu-latest
|
|
|
|
if: github.repository == 'qmk/qmk_firmware'
|
|
|
|
strategy:
|
|
matrix:
|
|
branch:
|
|
- xap
|
|
- riot
|
|
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
with:
|
|
token: ${{ secrets.QMK_BOT_TOKEN }}
|
|
fetch-depth: 0
|
|
|
|
- name: Disable automatic eol conversion
|
|
run: |
|
|
echo "* -text" > .git/info/attributes
|
|
|
|
- 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 }}
|