From 2edab1216843f20a00a7d8f171aca52cbc35d7fd Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 27 Jan 2025 05:07:13 -0800
Subject: [PATCH] Add GH action to manage servicing branch codeflow. (#18267)

---
 .config/feature-lsp-branch-merge.json |  8 ++++++++
 .config/service-branch-merge.json     | 13 +++++++++++++
 .github/workflows/branch-merge.yml    | 22 ++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 .config/feature-lsp-branch-merge.json
 create mode 100644 .config/service-branch-merge.json
 create mode 100644 .github/workflows/branch-merge.yml

diff --git a/.config/feature-lsp-branch-merge.json b/.config/feature-lsp-branch-merge.json
new file mode 100644
index 0000000000..e8ad87bc5d
--- /dev/null
+++ b/.config/feature-lsp-branch-merge.json
@@ -0,0 +1,8 @@
+{
+    "merge-flow-configurations": {
+        "main": {
+            "MergeToBranch": "feature/lsp",
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}
\ No newline at end of file
diff --git a/.config/service-branch-merge.json b/.config/service-branch-merge.json
new file mode 100644
index 0000000000..0c9d996e85
--- /dev/null
+++ b/.config/service-branch-merge.json
@@ -0,0 +1,13 @@
+{
+    "merge-flow-configurations": {
+        // regular branch flow
+        "release/dev17.13": {
+            "MergeToBranch": "main",
+            "ExtraSwitches": "-QuietComments"
+        },
+        "main": {
+            "MergeToBranch": "release/dev17.14",
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}
\ No newline at end of file
diff --git a/.github/workflows/branch-merge.yml b/.github/workflows/branch-merge.yml
new file mode 100644
index 0000000000..24b3989856
--- /dev/null
+++ b/.github/workflows/branch-merge.yml
@@ -0,0 +1,22 @@
+# Merges any changes from servicing branches forward.
+
+name: Flow servicing changes to main
+on:
+  push:
+   branches:
+     - 'release/*'
+     - 'main'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  servicing-flow:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    with:
+      configuration_file_path: '.config/service-branch-merge.json'
+  feature-lsp-flow:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    with:
+      configuration_file_path: '.config/feature-lsp-branch-merge.json'
\ No newline at end of file