Skip to content

Commit 6113a43

Browse files
authored
Ignore GH Action code flow PRs in PRFinder. (#1482)
The Arcade inter-branch merge GH action creates merge commits with a differently formatted message (ex. `[automated] Merge branch 'prerelease' => 'main' (#8039)`) Tested by generating PR list between Roslyn main and Roslyn release/dev18.0: *Before*: ```md ### Changes from [main](dotnet/roslyn@main) to [release/dev18.0](dotnet/roslyn@release/dev18.0): [View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/main...release/dev18.0?w=1) - [[automated] Merge branch 'main' => 'release/dev18.0' (77445)](dotnet/roslyn#77445) - [[automated] Merge branch 'main' => 'release/dev18.0' (77441)](dotnet/roslyn#77441) - [[automated] Merge branch 'main' => 'release/dev18.0' (77431)](dotnet/roslyn#77431) - [[automated] Merge branch 'main' => 'release/dev18.0' (77409)](dotnet/roslyn#77409) - [[automated] Merge branch 'main' => 'release/dev18.0' (77374)](dotnet/roslyn#77374) - [[automated] Merge branch 'main' => 'release/dev18.0' (77292)](dotnet/roslyn#77292) - [[automated] Merge branch 'main' => 'release/dev18.0' (77226)](dotnet/roslyn#77226) - [[automated] Merge branch 'main' => 'release/dev18.0' (77153)](dotnet/roslyn#77153) - [Update Versions.props for Dev18 (77138)](dotnet/roslyn#77138) ``` *After*: ```md ### Changes from [main](dotnet/roslyn@main) to [release/dev18.0](dotnet/roslyn@release/dev18.0): [View Complete Diff of Changes](https://github.com/dotnet/roslyn/compare/main...release/dev18.0?w=1) - [Update Versions.props for Dev18 (77138)](dotnet/roslyn#77138) ```
2 parents f30d935 + cb745bc commit 6113a43

File tree

1 file changed

+4
-1
lines changed
  • src/dotnet-roslyn-tools/PRFinder/Hosts

1 file changed

+4
-1
lines changed

src/dotnet-roslyn-tools/PRFinder/Hosts/GitHub.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public bool ShouldSkip(Commit commit, ref bool mergePRFound)
5555
}
5656

5757
// Exclude merge commits from auto code-flow PRs (e.g. merges/main-to-main-vs-deps)
58-
if (IsGitHubReleaseFlowCommit().Match(commit.MessageShort).Success)
58+
if (IsGitHubReleaseFlowCommit().Match(commit.MessageShort).Success ||
59+
IsGitHubActionCodeFlowCommit().Match(commit.MessageShort).Success)
5960
{
6061
mergePRFound = true;
6162
return true;
@@ -193,6 +194,8 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
193194

194195
[GeneratedRegex(@"^Merge pull request #\d+ from dotnet/merges/")]
195196
private static partial Regex IsGitHubReleaseFlowCommit();
197+
[GeneratedRegex(@"^\[automated\] Merge branch '.*' => '.*' \(#\d+\)")]
198+
private static partial Regex IsGitHubActionCodeFlowCommit();
196199
[GeneratedRegex(@"^Merge pull request #(\d+) from")]
197200
private static partial Regex IsGitHubMergePRCommit();
198201
[GeneratedRegex(@"\(#(\d+)\)(?:\n|$)")]

0 commit comments

Comments
 (0)