Skip to content

Fixed bug of deleting more than expected. #3250

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
12 commits merged into from
Apr 28, 2022
Merged

Fixed bug of deleting more than expected. #3250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4d03cc6
Change the direction of the commit date
sima-zhu Apr 28, 2022
f7ad031
Log on right place
sima-zhu Apr 28, 2022
8865aaa
remove auth
sima-zhu Apr 28, 2022
fe1d94e
fix typo
sima-zhu Apr 28, 2022
6e6789c
Add auth token back
sima-zhu Apr 28, 2022
40b165f
add delete back
sima-zhu Apr 28, 2022
9405b70
Update eng/common/scripts/Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
1340850
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
c4004c9
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
d1a3e81
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
54a6ae0
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
03c4132
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
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
16 changes: 12 additions & 4 deletions eng/common/scripts/Delete-RemoteBranches.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ foreach ($res in $responses)
continue
}
$branch = $res.ref
$branchName = $branch.Replace("refs/heads/","")
try {
$branchName = $branch.Replace("refs/heads/","")
$head = "${RepoId}:${branchName}"
LogDebug "Operating on branch [ $branchName ]"
$pullRequests = Get-GitHubPullRequests -RepoId $RepoId -State "all" -Head $head -AuthToken $AuthToken
Expand All @@ -53,26 +53,34 @@ foreach ($res in $responses)
continue
}

LogDebug "Branch [ $branchName ] in repo [ $RepoId ] has no associated open Pull Request. "
if ($LastCommitOlderThan) {
if (!$res.object -or !$res.object.url) {
LogWarning "No commit url returned from response. Skipping... "
continue
}
try {
$commitDate = Get-GithubReferenceCommitDate -commitUrl $res.object.url -AuthToken $AuthToken
if ($commitDate -and ($commitDate -gt $LastCommitOlderThan)) {
LogDebug "The branch $branch last commit date $commitDate is newer than the date $LastCommitOlderThan. Skipping."
if (!$commitDate)
{
LogDebug "No last commit date found. Skipping."
continue
}
if ($commitDate -gt $LastCommitOlderThan) {
LogDebug "The branch $branch last commit date [ $commitDate ] is newer than the date $LastCommitOlderThan. Skipping."
continue
}

LogDebug "Branch [ $branchName ] in repo [ $RepoId ] has a last commit date [ $commitDate ] that is older than $LastCommitOlderThan. "
Copy link
Member

@benbp benbp Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I generally use single quotes for special values in strings vs. brackets with spaces, as it will make your log statement shorter and easier to read without horizontal scrolling in some situations.

Copy link
Contributor Author

@sima-zhu sima-zhu Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is asking the change for the entire file. I am going to have follow up of switching github api to gh. I can make the changes over there.

}
catch {
LogError "Get-GithubReferenceCommitDate failed with exception:`n$_"
exit 1
}
}
LogDebug "Branch [ $branchName ] in repo [ $RepoId ] has no associated open Pull Request. "
try {
Remove-GitHubSourceReferences -RepoId $RepoId -Ref $branch -AuthToken $AuthToken
LogDebug "The branch [ $branchName ] in [ $RepoId ] has been deleted."
}
catch {
LogError "Remove-GitHubSourceReferences failed with exception:`n$_"
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Invoke-GitHubAPI.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,5 +429,5 @@ function Get-GithubReferenceCommitDate($commitUrl, $AuthToken) {
LogDebug "No date returned from the commit sha. "
return $null
}
return $commitData.committer.date
return $commitResponse.committer.date
}