Skip to content

Commit c552807

Browse files
committed
manually trigger merge instead
1 parent 511ea8b commit c552807

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# See https://github.com/dotnet/arcade/blob/e52018a/Documentation/Maestro/New-Inter-Branch-Merge-Approach.md
22

3-
name: Scheduled branch merge
3+
name: Branch merge
44
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 * * *'
85
workflow_dispatch:
96
inputs:
107
configuration_file_branch:
118
description: 'Branch to use for configuration file'
129
required: true
1310
default: 'main'
11+
configuration_file:
12+
description: 'Path to configuration file to use to run the merge'
13+
required: true
14+
default: 'eng/config/feature-branch-merge.jsonc'
1415

1516
permissions:
1617
contents: write
@@ -21,5 +22,5 @@ jobs:
2122
if: github.repository == 'dotnet/roslyn'
2223
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
2324
with:
24-
configuration_file_path: 'eng/config/feature-branch-merge.jsonc'
25+
configuration_file_path: ${{ inputs.configuration_file }}
2526
configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}

0 commit comments

Comments
 (0)