Skip to content

Commit 42af9fe

Browse files
authored
Enable auto-merges for 9.0 rel branches (#57333)
1 parent db8893b commit 42af9fe

File tree

2 files changed

+33
-0
lines changed

2 files changed

+33
-0
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Inter-branch merge workflow
2+
on:
3+
push:
4+
branches:
5+
- release/**
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
Merge:
13+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main

github-merge-flow.jsonc

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// IMPORTANT: This file is read by the merge flow from main branch only.
2+
{
3+
"merge-flow-configurations": {
4+
// Automate opening PRs to merge release/9.0 to main
5+
"release/9.0":{
6+
"MergeToBranch": "main",
7+
"ExtraSwitches": "-QuietComments"
8+
},
9+
// Automate opening PRs to merge release/9.0-rc1 to release/9.0
10+
"release/9.0-rc1":{
11+
"MergeToBranch": "release/9.0",
12+
"ExtraSwitches": "-QuietComments"
13+
},
14+
// Automate opening PRs to merge release/9.0-rc2 to release/9.0
15+
"release/9.0-rc2":{
16+
"MergeToBranch": "release/9.0",
17+
"ExtraSwitches": "-QuietComments"
18+
}
19+
}
20+
}

0 commit comments

Comments
 (0)