-
Notifications
You must be signed in to change notification settings - Fork 676
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7339 from dotnet/dev/jorobich/automate-snap-prs
Add GH workflow for snapping changes from one branch to another
- Loading branch information
Showing
3 changed files
with
34 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// ONLY THE VERSION OF THIS FILE IN THE MAIN BRANCH IS USED! | ||
{ | ||
"merge-flow-configurations": { | ||
// format of this section is | ||
// "source-branch-name": { | ||
// "MergeToBranch": "target-branch-name" | ||
// }, | ||
"main": { | ||
// The MergeToBranch property should be presented in the object in order the merge flow to work | ||
"MergeToBranch": "prerelease", | ||
// 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. Accepted values are similar to the values from the version file: https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json | ||
"ExtraSwitches": "-QuietComments" | ||
}, | ||
"prerelease": { | ||
"MergeToBranch": "release", | ||
// 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. Accepted values are similar to the values from the version file: https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json | ||
"ExtraSwitches": "-QuietComments" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
name: Branch snap | ||
on: | ||
workflow_dispatch | ||
|
||
permissions: | ||
contents: write | ||
pull-requests: write | ||
|
||
jobs: | ||
check-script: | ||
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main | ||
with: | ||
configuration_file_path: '.config/snap-flow.json' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
!.razorDevKit/** | ||
!.razoromnisharp/** | ||
.rpt2_cache/** | ||
.config/** | ||
.github/** | ||
.vscode/** | ||
.vscode-test/** | ||
|