Skip to content

Commit 5f01fe7

Browse files
authored
Add main to main-vs-deps flow (#78798)
* Create branch-merge2.jsonc * Update main-merge.yml * Rename branch-merge2.jsonc to branch-merge-2.jsonc * Update PublishData.json * Update and rename branch-merge.jsonc to main-to-main-vs-deps-branch-merge.jsonc * feedbacl * make clear main is for validation
1 parent 69ff992 commit 5f01fe7

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

.github/workflows/main-merge.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ jobs:
2121
if: github.repository == 'dotnet/roslyn'
2222
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
2323
with:
24-
configuration_file_path: 'eng/config/branch-merge.jsonc'
24+
configuration_file_path: 'eng/config/main-to-main-vs-deps-branch-merge.jsonc'
2525
configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}
26+

eng/config/PublishData.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,15 @@
176176
"insertionCreateDraftPR": false
177177
},
178178
"main": {
179+
"nugetKind": [
180+
"Shipping",
181+
"NonShipping"
182+
],
183+
"vsBranch": "main",
184+
"insertionCreateDraftPR": true,
185+
"insertionTitlePrefix": "[Validation]"
186+
},
187+
"main-vs-deps": {
179188
"nugetKind": [
180189
"Shipping",
181190
"NonShipping"

eng/config/branch-merge.jsonc

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Used by .github/workflows/main-merge.yml
2+
{
3+
"merge-flow-configurations": {
4+
// Merge any main changes to main-vs-deps.
5+
"main": {
6+
"MergeToBranch": "main-vs-deps",
7+
"ExtraSwitches": "-QuietComments"
8+
}
9+
}
10+
}

0 commit comments

Comments
 (0)