From 23404f05c1fa0aa380aaf5b0edb791169a4de741 Mon Sep 17 00:00:00 2001
From: Trezy <tre@trezy.com>
Date: Thu, 7 May 2026 14:50:26 -0500
Subject: [PATCH] ci: sync main with dev after release

---
 .github/workflows/merge-main-to-dev.yml | 31 +++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/merge-main-to-dev.yml

diff --git a/.github/workflows/merge-main-to-dev.yml b/.github/workflows/merge-main-to-dev.yml
new file mode 100644
index 0000000..e381a61
--- /dev/null
+++ b/.github/workflows/merge-main-to-dev.yml
@@ -0,0 +1,31 @@
+name: Merge main to dev
+
+on:
+  workflow_run:
+    workflows: [Release]
+    types: [completed]
+    branches: [main]
+
+jobs:
+  merge:
+    if: github.event.workflow_run.conclusion == 'success'
+    runs-on: depot-ubuntu-24.04
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: dev
+
+      - name: Merge main into dev
+        env:
+          GITHUB_TOKEN: ${{ secrets.DISPATCH_GH_TOKEN }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}"
+          git merge origin/main --no-edit
+          git push origin dev
-- 
2.51.2