Configure main-vs-deps

.github/workflows/main-merge.yml

@@ -1,18 +1,31 @@
-# Merges any changes from release/prerelease to main (e.g. servicing changes)
+# See https://github.com/dotnet/arcade/blob/e52018a/Documentation/Maestro/New-Inter-Branch-Merge-Approach.md
 
-name: Flow main to release/dev18.0
+name: Inter-branch merge
 on:
   schedule:
-    # once a day at 13:00 UTC to cleanup old runs
-    - cron: '0 13 * * *'
+    # Create a merge every 3 hours (works only for merges from `main`, others would need a `push` trigger).
+    - cron: '0 */3 * * *'
   workflow_dispatch:
+    inputs:
+      configuration_file_branch:
+        description: 'Branch to use for configuration file'
+        required: true
+        default: 'main'
 
 permissions:
   contents: write
   pull-requests: write
 
 jobs:
-  check-script:
+  # The config does not support multiple flows from the same source branch,
+  # so we need to run separately for each duplicate source branch (https://github.com/dotnet/arcade/issues/15586).
+  merge:
     uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
     with:
-      configuration_file_path: '.config/branch-merge.json'
+      configuration_file_path: 'eng/config/branch-merge.jsonc'
+      configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}
+  merge-2:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    with:
+      configuration_file_path: 'eng/config/branch-merge-2.jsonc'
+      configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}

eng/config/PublishData.json

@@ -178,6 +178,16 @@
       "insertionCreateDraftPR": true
     },
     "main": {
+      "nugetKind": [
+        "Shipping",
+        "NonShipping"
+      ],
+      "vsBranch": "main",
+      "vsMajorVersion": 17,
+      "insertionCreateDraftPR": true,
+      "insertionTitlePrefix": "[d17.14 P3]"
+    },
+    "main-vs-deps": {
       "nugetKind": [
         "Shipping",
         "NonShipping"

eng/config/branch-merge-2.jsonc

@@ -0,0 +1,10 @@
+// Used by .github/workflows/main-merge.yml
+{
+    "merge-flow-configurations": {
+        // Merge any main changes to main-vs-deps.
+        "main": {
+            "MergeToBranch": "main-vs-deps",
+            "ExtraSwitches": "-QuietComments"
+        }
+    }
+}

.config/branch-merge.json → eng/config/branch-merge.jsonc

@@ -1,3 +1,4 @@
+// Used by .github/workflows/main-merge.yml
 {
     "merge-flow-configurations": {
         // Merge any main changes to release/dev18.0.
@@ -6,4 +7,4 @@
             "ExtraSwitches": "-QuietComments"
         }
     }
-}
+}