Skip to content

Commit 38187ce

Browse files
authored
Fix duplicate parameter in github merge flow (#52344)
1 parent 5c9f0f9 commit 38187ce

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

github-merge-flow.jsonc

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,44 @@
44
// Automate opening PRs to merge cli release/8.0.1xx to 8.0.4xx
55
"release/8.0.1xx":{
66
"MergeToBranch": "release/8.0.4xx",
7-
"ExtraSwitches": "-QuietComments -ResetToTargetPaths global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*"
7+
"ExtraSwitches": "-QuietComments",
8+
"ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*"
89
},
910
// Automate opening PRs to merge sdk repos from release/8.0.4xx to 9.0.1xx
1011
"release/8.0.4xx":{
1112
"MergeToBranch": "release/9.0.1xx",
12-
"ExtraSwitches": "-QuietComments -ResetToTargetPaths global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*"
13+
"ExtraSwitches": "-QuietComments",
14+
"ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*"
1315
},
1416
// Automate opening PRs to merge sdk repos from release/9.0.1xx to release/9.0.3xx
1517
"release/9.0.1xx":{
1618
"MergeToBranch": "release/9.0.3xx",
17-
"ExtraSwitches": "-QuietComments -ResetToTargetPaths global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*"
19+
"ExtraSwitches": "-QuietComments",
20+
"ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*"
1821
},
1922
// Automate opening PRs to merge sdk repos from release/9.0.3xx to release/10.0.1xx
2023
"release/9.0.3xx":{
2124
"MergeToBranch": "release/10.0.1xx",
22-
"ExtraSwitches": "-QuietComments -ResetToTargetPaths global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*"
25+
"ExtraSwitches": "-QuietComments",
26+
"ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*"
2327
},
2428
// Automate opening PRs to merge sdk repos from release/10.0.1xx to release/10.0.2xx
2529
"release/10.0.1xx":{
2630
"MergeToBranch": "release/10.0.2xx",
27-
"ExtraSwitches": "-QuietComments -ResetToTargetPaths global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*"
31+
"ExtraSwitches": "-QuietComments",
32+
"ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*"
2833
},
2934
// Automate opening PRs to merge sdk repos from release/10.0.2xx to main
3035
"release/10.0.2xx":{
3136
"MergeToBranch": "main",
32-
"ExtraSwitches": "-QuietComments -ResetToTargetPaths global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*"
37+
"ExtraSwitches": "-QuietComments",
38+
"ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*"
3339
},
3440
// Automate opening PRs to merge sdk repos from dnup to release/dnup
3541
"dnup":{
3642
"MergeToBranch": "release/dnup",
37-
"ExtraSwitches": "-QuietComments -ResetToTargetPaths global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*"
43+
"ExtraSwitches": "-QuietComments",
44+
"ResetToTargetPaths": "global.json;NuGet.config;eng/Version.Details.xml;eng/Versions.props;eng/common/*"
3845
}
3946
}
4047
}

0 commit comments

Comments
 (0)