Skip to content
Open
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
26 changes: 26 additions & 0 deletions .github/workflows/branch-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# See https://github.com/dotnet/arcade/blob/e52018a/Documentation/Maestro/New-Inter-Branch-Merge-Approach.md

name: Branch merge
on:
workflow_dispatch:
inputs:
configuration_file_branch:
description: 'Branch to use for configuration file'
required: true
default: 'main'
configuration_file:
description: 'Path to configuration file to use to run the merge'
required: true
default: 'eng/config/branch-merge.jsonc'

permissions:
contents: write
pull-requests: write

jobs:
merge:
if: github.repository == 'dotnet/roslyn'
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
with:
configuration_file_path: ${{ inputs.configuration_file }}
configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}
11 changes: 11 additions & 0 deletions eng/config/branch-merge.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Used by .github/workflows/scheduled-branch-merge.yml
{
"merge-flow-configurations": {
// Merge main into feature branches
"main": {
"MergeToBranch": "features/collection-expression-arguments",
// ExtraSwitches is an optional parameter which is accepted by the script: https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml.
"ExtraSwitches": "-QuietComments"
}
}
}
Loading