summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-15 12:50:04 +0000
committerQMK Bot <hello@qmk.fm>2022-03-15 12:50:04 +0000
commit872b521e4f4474ba9a4f4eb640fbdb5a386f2ac4 (patch)
tree376da801fa5482a6d78ccf9280e7a67122d8c5a8 /.github/workflows
parent3315894269767014e0510cc95bb52edd3b0b5161 (diff)
parent46e85ded4747fb3d89f107cb098d9054ea5e632c (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/develop_update.yml8
-rw-r--r--.github/workflows/feature_branch_update.yml34
2 files changed, 34 insertions, 8 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
index 285720fefe..1f5c841bff 100644
--- a/.github/workflows/develop_update.yml
+++ b/.github/workflows/develop_update.yml
@@ -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"
diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
new file mode 100644
index 0000000000..fc7bbafd18
--- /dev/null
+++ b/.github/workflows/feature_branch_update.yml
@@ -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 }}