Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/yuling-sb-client-validation-alig…
Browse files Browse the repository at this point in the history
…nment' into yuling-sb-client-validation-alignment
  • Loading branch information
yunhaoling committed Nov 19, 2020
2 parents f6795f9 + 38a4799 commit a6a2c5d
Show file tree
Hide file tree
Showing 24 changed files with 106 additions and 655 deletions.
2 changes: 1 addition & 1 deletion eng/common/scripts/Add-IssueComment.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ param(
[string]$AuthToken
)

. "${PSScriptRoot}\common.ps1"
. (Join-Path $PSScriptRoot common.ps1)

try {
Add-GithubIssueComment -RepoOwner $RepoOwner -RepoName $RepoName `
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Add-IssueLabels.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ param(
[string]$AuthToken
)

. "${PSScriptRoot}\common.ps1"
. (Join-Path $PSScriptRoot common.ps1)

try {
Add-GithubIssueLabels -RepoOwner $RepoOwner -RepoName $RepoName `
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Delete-RemoteBranches.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ param(
$AuthToken
)

. "${PSScriptRoot}\common.ps1"
. (Join-Path $PSScriptRoot common.ps1)

LogDebug "Operating on Repo [ $RepoName ]"
try{
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Get-PullRequestCreator.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ param (
[string]$AuthToken
)

. "${PSScriptRoot}\common.ps1"
. (Join-Path $PSScriptRoot common.ps1)

try
{
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Package-Properties.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function Get-PkgProperties
{
$pkgDirectoryPath = Join-Path $serviceDirectoryPath $directory.Name

if ((Get-ChildItem -Path Function: | ? { $_.Name -eq $GetPackageInfoFromRepoFn }).Count -gt 0)
if ($GetPackageInfoFromRepoFn -and (Test-Path "Function:$GetPackageInfoFromRepoFn"))
{
$pkgProps = &$GetPackageInfoFromRepoFn -pkgPath $pkgDirectoryPath -serviceDirectory $ServiceDirectory -pkgName $PackageName
}
Expand Down
3 changes: 1 addition & 2 deletions eng/common/scripts/Queue-Pipeline.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ param(
[string]$Base64EncodedAuthToken
)

. "${PSScriptRoot}\logging.ps1"
. "${PSScriptRoot}\Invoke-DevOpsAPI.ps1"
. (Join-Path $PSScriptRoot common.ps1)

if ($CancelPreviousBuilds)
{
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Submit-PullRequest.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ param(
[boolean]$CloseAfterOpenForTesting=$false
)

. "${PSScriptRoot}\common.ps1"
. (Join-Path $PSScriptRoot common.ps1)

try {
$resp = Get-GitHubPullRequests -RepoOwner $RepoOwner -RepoName $RepoName `
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/Update-ChangeLog.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if ($ReleaseDate -and ($Unreleased -eq $True)) {
exit 1
}

. "${PSScriptRoot}\common.ps1"
. (Join-Path $PSScriptRoot common.ps1)

if ($ReleaseDate)
{
Expand Down
Loading

0 comments on commit a6a2c5d

Please sign in to comment.