From 6f191fabfdb2e6689ea58119bf787f7ed3cf9d45 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Fri, 20 Sep 2024 13:20:06 +0530 Subject: [PATCH 1/3] Interbranch workflow Sync changes between branches. --- .github/workflows/main.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000000..7cd5b0c7a53 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,13 @@ +name: Inter-branch merge workflow +on: + push: + branches: + - release/** + +permissions: + contents: write + pull-requests: write + +jobs: + Merge: + uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main From 69000078031205ad3fa07c7d8ee5100494b00661 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Fri, 20 Sep 2024 16:12:06 +0530 Subject: [PATCH 2/3] add configuration for flow --- github-merge-flow.jsonc.txt | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 github-merge-flow.jsonc.txt diff --git a/github-merge-flow.jsonc.txt b/github-merge-flow.jsonc.txt new file mode 100644 index 00000000000..98e31ea24a8 --- /dev/null +++ b/github-merge-flow.jsonc.txt @@ -0,0 +1,30 @@ +// IMPORTANT: This file is read by the merge flow from main branch only. +{ + "merge-flow-configurations": { + // Automate merging runtime release/6.0 branch into release/6.0-staging + "release/6.0":{ + "MergeToBranch": "release/6.0-staging", + "ExtraSwitches": "-QuietComments" + }, + // Automate merging runtime release/8.0 branch into release/8.0-staging + "release/8.0":{ + "MergeToBranch": "release/8.0-staging", + "ExtraSwitches": "-QuietComments" + }, + // Automate merging runtime release/8.0-rc branches back to release/8.0 + "release/8.0-rc":{ + "MergeToBranch": "release/8.0", + "ExtraSwitches": "-QuietComments" + }, + // Automate merging runtime release/9.0-rc1 branch back to release/9.0 + "release/9.0-rc1":{ + "MergeToBranch": "release/9.0", + "ExtraSwitches": "-QuietComments" + }, + // Automate merging runtime release/9.0-rc2 branch back to release/9.0 + "release/9.0-rc2":{ + "MergeToBranch": "release/9.0", + "ExtraSwitches": "-QuietComments" + } + } +} From cf4aa25711535c7516fada0d12860a63cd58cbac Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 23 Sep 2024 09:22:20 +0530 Subject: [PATCH 3/3] address review comments on configurations --- github-merge-flow.jsonc.txt | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/github-merge-flow.jsonc.txt b/github-merge-flow.jsonc.txt index 98e31ea24a8..b29ff9a08af 100644 --- a/github-merge-flow.jsonc.txt +++ b/github-merge-flow.jsonc.txt @@ -1,26 +1,7 @@ // IMPORTANT: This file is read by the merge flow from main branch only. { "merge-flow-configurations": { - // Automate merging runtime release/6.0 branch into release/6.0-staging - "release/6.0":{ - "MergeToBranch": "release/6.0-staging", - "ExtraSwitches": "-QuietComments" - }, - // Automate merging runtime release/8.0 branch into release/8.0-staging - "release/8.0":{ - "MergeToBranch": "release/8.0-staging", - "ExtraSwitches": "-QuietComments" - }, - // Automate merging runtime release/8.0-rc branches back to release/8.0 - "release/8.0-rc":{ - "MergeToBranch": "release/8.0", - "ExtraSwitches": "-QuietComments" - }, - // Automate merging runtime release/9.0-rc1 branch back to release/9.0 - "release/9.0-rc1":{ - "MergeToBranch": "release/9.0", - "ExtraSwitches": "-QuietComments" - }, + // Automate merging runtime release/9.0-rc2 branch back to release/9.0 "release/9.0-rc2":{ "MergeToBranch": "release/9.0",