1 files changed, 30 insertions, 0 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
new file mode 100644
index 0000000000..90159406a6
--- /dev/null
+++ b/.github/workflows/develop_update.yml
@@ -0,0 +1,30 @@
+name: Update develop after master merge
+
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  develop_update:
+    runs-on: ubuntu-latest
+
+    if: github.repository == 'qmk/qmk_firmware'
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        token: ${{ secrets.QMK_BOT_TOKEN }}
+        fetch-depth: 0
+
+    - name: Checkout develop
+      run: |
+        git fetch origin master develop
+        git checkout develop
+
+    - name: Update develop from master
+      run: |
+        git config --global user.name "QMK Bot"
+        git config --global user.email "hello@qmk.fm"
+        git merge origin/master
+        git push origin develop