Skip to content

Commit 5585ba5

Browse files
authored
Add scheduled merges to feature branch
1 parent 0ae5973 commit 5585ba5

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# See https://github.com/dotnet/arcade/blob/e52018a/Documentation/Maestro/New-Inter-Branch-Merge-Approach.md
2+
3+
name: Scheduled branch merge
4+
on:
5+
schedule:
6+
# Create a merge every day (works only for merges from `main`, others would need a `push` trigger).
7+
- cron: '0 0 * * *'
8+
workflow_dispatch:
9+
inputs:
10+
configuration_file_branch:
11+
description: 'Branch to use for configuration file'
12+
required: true
13+
default: 'main'
14+
15+
permissions:
16+
contents: write
17+
pull-requests: write
18+
19+
jobs:
20+
merge:
21+
if: github.repository == 'dotnet/roslyn'
22+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
23+
with:
24+
configuration_file_path: 'eng/config/community-to-main-branch-merge.jsonc'
25+
configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Used by .github/workflows/scheduled-branch-merge.yml
2+
{
3+
"merge-flow-configurations": {
4+
// Merge main into feature branches
5+
"main": {
6+
"MergeToBranch": "features/collection-expression-arguments",
7+
// 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.
8+
"ExtraSwitches": "-QuietComments"
9+
}
10+
}
11+
}

0 commit comments

Comments
 (0)