Revert "chore: move orginal github actions away"

This reverts commit 2db2123eed.
2026-11-03 16:10:05 +00:00 · 2025-04-10 08:42:22 +02:00
parent 3d3a47e9a2
commit fe92bee7fe
33 changed files with 0 additions and 0 deletions
@@ -0,0 +1,15 @@
+# Gitflow merge-back master->develop
+name: Merge master -> develop
+on:
+    push:
+        branches: [master]
+concurrency: ${{ github.repository }}-${{ github.workflow }}
+permissions: {} # We use ELEMENT_BOT_TOKEN instead
+jobs:
+    merge:
+        uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+        with:
+            dependencies: |
+                matrix-js-sdk