Skip to content

Commit 2edab12

Browse files
authored
Add GH action to manage servicing branch codeflow. (dotnet#18267)
1 parent 06e27ed commit 2edab12

File tree

3 files changed

+43
-0
lines changed

3 files changed

+43
-0
lines changed

.config/feature-lsp-branch-merge.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"merge-flow-configurations": {
3+
"main": {
4+
"MergeToBranch": "feature/lsp",
5+
"ExtraSwitches": "-QuietComments"
6+
}
7+
}
8+
}

.config/service-branch-merge.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"merge-flow-configurations": {
3+
// regular branch flow
4+
"release/dev17.13": {
5+
"MergeToBranch": "main",
6+
"ExtraSwitches": "-QuietComments"
7+
},
8+
"main": {
9+
"MergeToBranch": "release/dev17.14",
10+
"ExtraSwitches": "-QuietComments"
11+
}
12+
}
13+
}

.github/workflows/branch-merge.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Merges any changes from servicing branches forward.
2+
3+
name: Flow servicing changes to main
4+
on:
5+
push:
6+
branches:
7+
- 'release/*'
8+
- 'main'
9+
10+
permissions:
11+
contents: write
12+
pull-requests: write
13+
14+
jobs:
15+
servicing-flow:
16+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
17+
with:
18+
configuration_file_path: '.config/service-branch-merge.json'
19+
feature-lsp-flow:
20+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
21+
with:
22+
configuration_file_path: '.config/feature-lsp-branch-merge.json'

0 commit comments

Comments
 (0)