Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .config/feature-lsp-branch-merge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"merge-flow-configurations": {
"main": {
"MergeToBranch": "feature/lsp",
"ExtraSwitches": "-QuietComments"
}
}
}
13 changes: 13 additions & 0 deletions .config/service-branch-merge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"merge-flow-configurations": {
// regular branch flow
"release/dev17.13": {
"MergeToBranch": "main",
"ExtraSwitches": "-QuietComments"
},
"main": {
"MergeToBranch": "release/dev17.14",
"ExtraSwitches": "-QuietComments"
}
}
}
22 changes: 22 additions & 0 deletions .github/workflows/branch-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Merges any changes from servicing branches forward.

name: Flow servicing 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-lsp-flow:
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
with:
configuration_file_path: '.config/feature-lsp-branch-merge.json'
Loading