Skip to content

Commit

Permalink
Merge pull request #7339 from dotnet/dev/jorobich/automate-snap-prs
Browse files Browse the repository at this point in the history
Add GH workflow for snapping changes from one branch to another
  • Loading branch information
dibarbet authored Jul 12, 2024
2 parents dd0cd20 + 2ecbff8 commit e5a1976
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
20 changes: 20 additions & 0 deletions .config/snap-flow.json
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"
}
}
}
13 changes: 13 additions & 0 deletions .github/workflows/branch-snap.yml
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'
1 change: 1 addition & 0 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
!.razorDevKit/**
!.razoromnisharp/**
.rpt2_cache/**
.config/**
.github/**
.vscode/**
.vscode-test/**
Expand Down

0 comments on commit e5a1976

Please sign in to comment.