Add main to release/dev18.0 flow (#77148)

* add main to release/dev18.0 flow * add workflow-dispatch
dotnet · Feb 11, 2025 · 90522a1 · 90522a1
1 parent e1fab1c
commit 90522a1
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/.config/branch-merge.json b/.config/branch-merge.json
@@ -0,0 +1,9 @@
+{
+    "merge-flow-configurations": {
+        // Merge any main changes to release/dev18.0.
+        "main": {
+            "MergeToBranch": "release/dev18.0",
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}
diff --git a/.github/workflows/main-merge.yml b/.github/workflows/main-merge.yml
@@ -0,0 +1,18 @@
+# Merges any changes from release/prerelease to main (e.g. servicing changes)
+
+name: Flow main to release/dev18.0
+on:
+  schedule:
+    # once a day at 13:00 UTC to cleanup old runs
+    - cron: '0 13 * * *'
+  workflow_dispatch:
+
+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'
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -5,6 +5,7 @@ trigger:
     - main-vs-deps
     - release/dev16.*-vs-deps
     - release/dev17.*
+    - release/dev18.*
     - features/lsp_tools_host
     exclude:
     - release/dev17.0