Skip to content

Update the GH squash commit RegEx to remove the PR number. #1483

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
JoeRobich merged 2 commits into from
Mar 15, 2025
Merged

Update the GH squash commit RegEx to remove the PR number. #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c250bd
Update the GH squash commit RegEx to remove the PR number.
JoeRobich Mar 15, 2025
8b1d805
Fix up comment
JoeRobich Mar 15, 2025
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
21 changes: 21 additions & 0 deletions src/dotnet-roslyn-tools/.vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,27 @@
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Run `pr-finder` on Razor",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/../../artifacts/bin/Microsoft.RoslynTools/Debug/net9.0/Microsoft.RoslynTools.dll",
"args": [
"pr-finder",
"-s",
"e15fe5b8b38c1b1e1adb9c8a4d76567aa1c397db",
"-e",
"main",
"--format",
"changelog",
"-v",
"diag"
],
"cwd": "${workspaceFolder}/../../../razor",
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Run `vsbranchinfo`",
"type": "coreclr",
Expand Down
8 changes: 4 additions & 4 deletions src/dotnet-roslyn-tools/PRFinder/Hosts/GitHub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ public bool ShouldSkip(Commit commit, ref bool mergePRFound)
match = IsGitHubSquashedPRCommit().Match(commit.MessageShort);
if (match.Success)
{
var prNumber = match.Groups[1].Value;
var prNumber = match.Groups[2].Value;

// Squash PR Messages are in the form "Nullable annotate TypeCompilationState and MessageID (#39449)"
// Take the 1st line since it should be descriptive.
var comment = commit.MessageShort;
// Take the first line up until the PR number.
var comment = match.Groups[1].Value;
return new(prNumber, comment);
}
}
Expand Down Expand Up @@ -198,6 +198,6 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
private static partial Regex IsGitHubActionCodeFlowCommit();
[GeneratedRegex(@"^Merge pull request #(\d+) from")]
private static partial Regex IsGitHubMergePRCommit();
[GeneratedRegex(@"\(#(\d+)\)(?:\n|$)")]
[GeneratedRegex(@"^(.*) \(#(\d+)\)(?:\n|$)")]
private static partial Regex IsGitHubSquashedPRCommit();
}