Skip to content

Automate MSBuild's merge chain #867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmitche merged 1 commit into from
Feb 13, 2023
Merged

Automate MSBuild's merge chain #867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 41 additions & 8 deletions Maestro/subscriptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,11 +1316,11 @@
}
}
},
// Automate opening PRs to merge msbuild's vs17* branches into main
// For details on how the triggerpath globbing syntax works, see: https://github.com/dotnet/versions/issues/558
// MSBuild servicing chain from oldest supported through currently-supported to main
// Automate opening PRs to merge msbuild's vs16.11 into vs17.0
{
"triggerPaths": [
"https://github.com/dotnet/msbuild/blob/vs17/**/*"
"https://github.com/dotnet/msbuild/blob/vs16.11/**/*"
],
"action": "github-dnceng-branch-merge-pr-generator",
"actionArguments": {
Expand All @@ -1329,14 +1329,14 @@
"GithubRepoOwner": "dotnet",
"GithubRepoName": "<trigger-repo>",
"HeadBranch": "<trigger-branch>",
"BaseBranch": "main"
"BaseBranch": "vs17.0"
}
}
},
// Automate opening PRs to merge msbuild's vs16.10 into vs16.11 and vs16.11 into main
// Automate opening PRs to merge msbuild's vs17.0 into vs17.2
{
"triggerPaths": [
"https://github.com/dotnet/msbuild/blob/vs16.10/**/*"
"https://github.com/dotnet/msbuild/blob/vs17.0/**/*"
],
"action": "github-dnceng-branch-merge-pr-generator",
"actionArguments": {
Expand All @@ -1345,13 +1345,46 @@
"GithubRepoOwner": "dotnet",
"GithubRepoName": "<trigger-repo>",
"HeadBranch": "<trigger-branch>",
"BaseBranch": "vs16.11"
"BaseBranch": "vs17.2"
}
}
},
// Automate opening PRs to merge msbuild's vs17.2 into vs17.4
{
"triggerPaths": [
"https://github.com/dotnet/msbuild/blob/vs16.11/**/*"
"https://github.com/dotnet/msbuild/blob/vs17.2/**/*"
],
"action": "github-dnceng-branch-merge-pr-generator",
"actionArguments": {
"vsoSourceBranch": "main",
"vsoBuildParameters": {
"GithubRepoOwner": "dotnet",
"GithubRepoName": "<trigger-repo>",
"HeadBranch": "<trigger-branch>",
"BaseBranch": "vs17.4"
}
}
},
// Automate opening PRs to merge msbuild's vs17.4 into vs17.5
{
"triggerPaths": [
"https://github.com/dotnet/msbuild/blob/vs17.4/**/*"
],
"action": "github-dnceng-branch-merge-pr-generator",
"actionArguments": {
"vsoSourceBranch": "main",
"vsoBuildParameters": {
"GithubRepoOwner": "dotnet",
"GithubRepoName": "<trigger-repo>",
"HeadBranch": "<trigger-branch>",
"BaseBranch": "vs17.5"
}
}
},
// MSBuild latest release to main
{
"triggerPaths": [
"https://github.com/dotnet/msbuild/blob/vs17.5/**/*"
],
"action": "github-dnceng-branch-merge-pr-generator",
"actionArguments": {
Expand Down