update workflow

Altinity · Feb 25, 2025 · 2a99af1 · 2a99af1
1 parent 45516d6
commit 2a99af1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml
@@ -0,0 +1,19 @@
+name: Merge main -> release
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  sync-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Merge main -> release
+        uses: devmasx/merge-branch@master
+        with:
+          type: now
+          from_branch: main
+          target_branch: release
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - release
+  workflow_call:
+  workflow_dispatch:
 
 permissions:
   contents: write