Skip to content

Commit c54dea7

Browse files
authored
Ignore GH Action code flow PRs in PRFinder.
The Arcade inter-branch merge GH action creates merge commits with a differently formatted message. See dotnet/vscode-csharp@5b2cc8c for an example.
1 parent f30d935 commit c54dea7

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 '.*' => '.*'")]
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)