Skip to content
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

Jump to bottom

Sync eng/common directory with azure-sdk-tools for PR 3250 #3595

Merged
merged 12 commits into from
Apr 28, 2022
Merged

Sync eng/common directory with azure-sdk-tools for PR 3250 #3595

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
0ceb10e
Change the direction of the commit date
sima-zhu Apr 28, 2022
cf20f91
Log on right place
sima-zhu Apr 28, 2022
ad28d8f
remove auth
sima-zhu Apr 28, 2022
241bcc3
fix typo
sima-zhu Apr 28, 2022
99e3417
Add auth token back
sima-zhu Apr 28, 2022
71e2ac3
add delete back
sima-zhu Apr 28, 2022
724b67d
Update eng/common/scripts/Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
c031dbd
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
87cdaef
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
e3dd08a
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
c766278
Update Delete-RemoteBranches.ps1
sima-zhu Apr 28, 2022
0c6cc17
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. "
}
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
}