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 diff --git a/github-merge-flow.jsonc.txt b/github-merge-flow.jsonc.txt new file mode 100644 index 00000000000..b29ff9a08af --- /dev/null +++ b/github-merge-flow.jsonc.txt @@ -0,0 +1,11 @@ +// IMPORTANT: This file is read by the merge flow from main branch only. +{ + "merge-flow-configurations": { + + // Automate merging runtime release/9.0-rc2 branch back to release/9.0 + "release/9.0-rc2":{ + "MergeToBranch": "release/9.0", + "ExtraSwitches": "-QuietComments" + } + } +}