From 66125864a4c19a3e566a33ca50aaa1c1feee8dfd Mon Sep 17 00:00:00 2001 From: Ankita Khera <40616383+akhera99@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:03:52 -0700 Subject: [PATCH 1/7] Create branch-merge2.jsonc --- eng/config/branch-merge2.jsonc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 eng/config/branch-merge2.jsonc diff --git a/eng/config/branch-merge2.jsonc b/eng/config/branch-merge2.jsonc new file mode 100644 index 0000000000000..cd979074b54a4 --- /dev/null +++ b/eng/config/branch-merge2.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" + } + } +} From 5833d9dbec77cd554d10cf2a47bd871a102870a8 Mon Sep 17 00:00:00 2001 From: Ankita Khera <40616383+akhera99@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:05:36 -0700 Subject: [PATCH 2/7] Update main-merge.yml --- .github/workflows/main-merge.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main-merge.yml b/.github/workflows/main-merge.yml index 15711d10c9e5a..c2212a0948b52 100644 --- a/.github/workflows/main-merge.yml +++ b/.github/workflows/main-merge.yml @@ -23,3 +23,8 @@ jobs: with: 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' }} From 707ddd844493b9f9f1d0f12578debb0f9a371366 Mon Sep 17 00:00:00 2001 From: Ankita Khera <40616383+akhera99@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:06:05 -0700 Subject: [PATCH 3/7] Rename branch-merge2.jsonc to branch-merge-2.jsonc --- eng/config/{branch-merge2.jsonc => branch-merge-2.jsonc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename eng/config/{branch-merge2.jsonc => branch-merge-2.jsonc} (100%) diff --git a/eng/config/branch-merge2.jsonc b/eng/config/branch-merge-2.jsonc similarity index 100% rename from eng/config/branch-merge2.jsonc rename to eng/config/branch-merge-2.jsonc From d32843cc0e02719197ce77981bede25dbb9be72d Mon Sep 17 00:00:00 2001 From: Ankita Khera <40616383+akhera99@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:20:43 -0700 Subject: [PATCH 4/7] Update PublishData.json --- eng/config/PublishData.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json index 1d494eeb3f501..36ee6c3b16724 100644 --- a/eng/config/PublishData.json +++ b/eng/config/PublishData.json @@ -176,6 +176,15 @@ "insertionCreateDraftPR": false }, "main": { + "nugetKind": [ + "Shipping", + "NonShipping" + ], + "vsBranch": "main", + "insertionCreateDraftPR": true, + "insertionTitlePrefix": "[d17.15 P1]" + }, + "main-vs-deps": { "nugetKind": [ "Shipping", "NonShipping" From b95f41ac49390f87be94d83786feb538aea8ddf2 Mon Sep 17 00:00:00 2001 From: Ankita Khera <40616383+akhera99@users.noreply.github.com> Date: Mon, 2 Jun 2025 14:21:51 -0700 Subject: [PATCH 5/7] Update and rename branch-merge.jsonc to main-to-main-vs-deps-branch-merge.jsonc --- eng/config/branch-merge.jsonc | 9 --------- eng/config/main-to-main-vs-deps-branch-merge.jsonc | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 eng/config/branch-merge.jsonc create mode 100644 eng/config/main-to-main-vs-deps-branch-merge.jsonc diff --git a/eng/config/branch-merge.jsonc b/eng/config/branch-merge.jsonc deleted file mode 100644 index 2c2a486a106ea..0000000000000 --- a/eng/config/branch-merge.jsonc +++ /dev/null @@ -1,9 +0,0 @@ -// Used by .github/workflows/main-merge.yml -{ - "merge-flow-configurations": { - // "main": { - // "MergeToBranch": "release/dev17.15", - // "ExtraSwitches": "-QuietComments" - // } - } -} diff --git a/eng/config/main-to-main-vs-deps-branch-merge.jsonc b/eng/config/main-to-main-vs-deps-branch-merge.jsonc new file mode 100644 index 0000000000000..cd979074b54a4 --- /dev/null +++ b/eng/config/main-to-main-vs-deps-branch-merge.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" + } + } +} From f68b4e7dca65450d5320b76113afc4563ae1c1ca Mon Sep 17 00:00:00 2001 From: akhera99 Date: Mon, 2 Jun 2025 14:25:28 -0700 Subject: [PATCH 6/7] feedbacl --- .github/workflows/main-merge.yml | 8 ++------ eng/config/branch-merge-2.jsonc | 10 ---------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 eng/config/branch-merge-2.jsonc diff --git a/.github/workflows/main-merge.yml b/.github/workflows/main-merge.yml index c2212a0948b52..81c9ce099e1c1 100644 --- a/.github/workflows/main-merge.yml +++ b/.github/workflows/main-merge.yml @@ -21,10 +21,6 @@ jobs: if: github.repository == 'dotnet/roslyn' uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main with: - 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_path: 'eng/config/main-to-main-vs-deps-branch-merge.jsonc' configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }} + diff --git a/eng/config/branch-merge-2.jsonc b/eng/config/branch-merge-2.jsonc deleted file mode 100644 index cd979074b54a4..0000000000000 --- a/eng/config/branch-merge-2.jsonc +++ /dev/null @@ -1,10 +0,0 @@ -// 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" - } - } -} From 4f83112227c2c9f1caf8cf4c43cffb4498d853af Mon Sep 17 00:00:00 2001 From: akhera99 Date: Mon, 2 Jun 2025 15:34:50 -0700 Subject: [PATCH 7/7] make clear main is for validation --- eng/config/PublishData.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json index 36ee6c3b16724..e2ad4fac15ab1 100644 --- a/eng/config/PublishData.json +++ b/eng/config/PublishData.json @@ -182,7 +182,7 @@ ], "vsBranch": "main", "insertionCreateDraftPR": true, - "insertionTitlePrefix": "[d17.15 P1]" + "insertionTitlePrefix": "[Validation]" }, "main-vs-deps": { "nugetKind": [