From 5cd4de7a466975f7ccf96a5211d20ad2f836db5f Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 24 Jan 2025 14:51:11 -0800 Subject: [PATCH 1/4] Add GH action to manage servicing branch codeflow. --- .config/feature-branch-merge.json | 9 +++++++++ .config/service-branch-merge.json | 13 +++++++++++++ .github/workflows/branch-merge.yml | 22 ++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 .config/feature-branch-merge.json create mode 100644 .config/service-branch-merge.json create mode 100644 .github/workflows/branch-merge.yml diff --git a/.config/feature-branch-merge.json b/.config/feature-branch-merge.json new file mode 100644 index 00000000000..e36b350dfb2 --- /dev/null +++ b/.config/feature-branch-merge.json @@ -0,0 +1,9 @@ +{ + "merge-flow-configurations": { + // feature branches + "main": { + "MergeToBranch": "feature/lsp", + "ExtraSwitches": "-QuietComments" + } + } +} \ No newline at end of file diff --git a/.config/service-branch-merge.json b/.config/service-branch-merge.json new file mode 100644 index 00000000000..8704fa8def9 --- /dev/null +++ b/.config/service-branch-merge.json @@ -0,0 +1,13 @@ +{ + "merge-flow-configurations": { + // regular branch flow --> + "release/dev17.13": { + "MergeToBranch": "main", + "ExtraSwitches": "-QuietComments" + }, + "main": { + "MergeToBranch": "release/dev17.14", + "ExtraSwitches": "-QuietComments" + } + } +} \ No newline at end of file diff --git a/.github/workflows/branch-merge.yml b/.github/workflows/branch-merge.yml new file mode 100644 index 00000000000..bfb763815c9 --- /dev/null +++ b/.github/workflows/branch-merge.yml @@ -0,0 +1,22 @@ +# Merges any changes from servicing branches forward. + +name: Flow release/prerelease changes to main +on: + push: + branches: + - 'release/*' + - 'main' + +permissions: + contents: write + pull-requests: write + +jobs: + servicing-flow: + uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main + with: + configuration_file_path: '.config/service-branch-merge.json' + feature-flow: + uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main + with: + configuration_file_path: '.config/feature-branch-merge.json' \ No newline at end of file From a10ee4515bb08357f5e033d97dc2fd733bd662de Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 24 Jan 2025 15:02:21 -0800 Subject: [PATCH 2/4] Update workflow name in branch-merge.yml --- .github/workflows/branch-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-merge.yml b/.github/workflows/branch-merge.yml index bfb763815c9..c272ac34e0f 100644 --- a/.github/workflows/branch-merge.yml +++ b/.github/workflows/branch-merge.yml @@ -1,6 +1,6 @@ # Merges any changes from servicing branches forward. -name: Flow release/prerelease changes to main +name: Flow servicing changes to main on: push: branches: From 2bff2c2e083d85d7bebbb0945e2cfe1271b42650 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 24 Jan 2025 15:20:11 -0800 Subject: [PATCH 3/4] Update comment --- .config/service-branch-merge.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/service-branch-merge.json b/.config/service-branch-merge.json index 8704fa8def9..0c9d996e850 100644 --- a/.config/service-branch-merge.json +++ b/.config/service-branch-merge.json @@ -1,6 +1,6 @@ { "merge-flow-configurations": { - // regular branch flow --> + // regular branch flow "release/dev17.13": { "MergeToBranch": "main", "ExtraSwitches": "-QuietComments" From 70a5f9722484dbe62da8474fe52495b8e3b2434c Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Mon, 27 Jan 2025 12:50:06 +0100 Subject: [PATCH 4/4] Rename generic feature branch to specific LSP Since there needs to be a separate config for each feature. --- ...eature-branch-merge.json => feature-lsp-branch-merge.json} | 1 - .github/workflows/branch-merge.yml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) rename .config/{feature-branch-merge.json => feature-lsp-branch-merge.json} (85%) diff --git a/.config/feature-branch-merge.json b/.config/feature-lsp-branch-merge.json similarity index 85% rename from .config/feature-branch-merge.json rename to .config/feature-lsp-branch-merge.json index e36b350dfb2..e8ad87bc5d8 100644 --- a/.config/feature-branch-merge.json +++ b/.config/feature-lsp-branch-merge.json @@ -1,6 +1,5 @@ { "merge-flow-configurations": { - // feature branches "main": { "MergeToBranch": "feature/lsp", "ExtraSwitches": "-QuietComments" diff --git a/.github/workflows/branch-merge.yml b/.github/workflows/branch-merge.yml index c272ac34e0f..24b3989856c 100644 --- a/.github/workflows/branch-merge.yml +++ b/.github/workflows/branch-merge.yml @@ -16,7 +16,7 @@ jobs: uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main with: configuration_file_path: '.config/service-branch-merge.json' - feature-flow: + feature-lsp-flow: uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main with: - configuration_file_path: '.config/feature-branch-merge.json' \ No newline at end of file + configuration_file_path: '.config/feature-lsp-branch-merge.json' \ No newline at end of file