Merge pull request dotnet#9821 from dotnet/interbranch-Workflow

Interbranch workflow
h3xds1nz · Sep 23, 2024 · 14a505e · 14a505e
2 parents fa99ccd + cf4aa25
commit 14a505e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,13 @@
+name: Inter-branch merge workflow
+on:
+  push:
+    branches:
+      - release/**
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Merge:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
diff --git a/github-merge-flow.jsonc.txt b/github-merge-flow.jsonc.txt
@@ -0,0 +1,11 @@
+// IMPORTANT: This file is read by the merge flow from main branch only. 
+{
+    "merge-flow-configurations": {
+
+        // Automate merging runtime release/9.0-rc2 branch back to release/9.0
+        "release/9.0-rc2":{
+            "MergeToBranch": "release/9.0",
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}