Skip to content

Commit 6eaf41a

Browse files
authored
Sync eng/common directory with azure-sdk-tools repository (Azure#9934)
1 parent 6e8653f commit 6eaf41a

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

eng/common/scripts/Verify-ChangeLog.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ param (
1111
[boolean]$ForRelease=$False
1212
)
1313

14+
$ProgressPreference = "SilentlyContinue"
1415
. (Join-Path $PSScriptRoot SemVer.ps1)
1516
Import-Module (Join-Path $PSScriptRoot modules ChangeLog-Operations.psm1)
1617

eng/common/scripts/modules/Package-Properties.psm1

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class PackageProps
4545
}
4646
}
4747

48+
$ProgressPreference = "SilentlyContinue"
4849
Install-Module -Name powershell-yaml -RequiredVersion 0.4.1 -Force -Scope CurrentUser
4950

5051
function Extract-PkgProps ($pkgPath, $serviceName, $pkgName, $lang)
@@ -239,8 +240,14 @@ function Get-PkgListFromYml ($ciYmlPath)
239240
{
240241
$ciYmlContent = Get-Content $ciYmlPath -Raw
241242
$ciYmlObj = ConvertFrom-Yaml $ciYmlContent -Ordered
242-
$artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]
243-
243+
if ($ciYmlObj.Contains("stages"))
244+
{
245+
$artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]
246+
}
247+
elseif ($ciYmlObj.Contains("extends"))
248+
{
249+
$artifactsInCI = $ciYmlObj["extends"]["parameters"]["Artifacts"]
250+
}
244251
if ($artifactsInCI -eq $null)
245252
{
246253
Write-Error "Failed to retrive package names in ci $ciYmlPath"

0 commit comments

Comments
 (0)