Merge pull request #7357 from dibarbet/branch_merge_action

Add github action for scheduled branch merge

Author: dibarbet

.config/branch-merge.json

@@ -0,0 +1,14 @@
+{
+    "merge-flow-configurations": {
+        // Merge any prerelease only changes to main.
+        "prerelease": {
+            "MergeToBranch": "main",
+            "ExtraSwitches": "-QuietComments"
+        },
+        // Merge any release only changes to main.
+        "release": {
+            "MergeToBranch": "release",
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}

.github/workflows/branch-merge.yml

@@ -0,0 +1,17 @@
+# Merges any changes from release/prerelease to main (e.g. servicing changes)
+
+name: Flow release/prerelease changes to main
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 */3 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  check-script:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    with:
+      configuration_file_path: '.config/branch-merge.json'