Skip to content

Commit

Permalink
Fixes as per review comments to handle track 1 packages
Browse files Browse the repository at this point in the history
  • Loading branch information
praveenkuttappan authored and azure-sdk committed Jan 29, 2021
1 parent 141b7ce commit 1cd9a9d
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 27 deletions.
21 changes: 11 additions & 10 deletions eng/common/pipelines/templates/steps/daily-dev-build-variable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
parameters:
ServiceDirectory: ''
steps:
- task: Powershell@2
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1
arguments: >
-ServiceName ${{parameters.ServiceDirectory}}
-OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
pwsh: true
workingDirectory: $(Pipeline.Workspace)
displayName: Dump Package properties
condition: succeededOrFailed()
- ${{if ne(parameters.ServiceDirectory, '')}}:
- task: Powershell@2
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1
arguments: >
-ServiceDirectory ${{parameters.ServiceDirectory}}
-OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
pwsh: true
workingDirectory: $(Pipeline.Workspace)
displayName: Dump Package properties
condition: succeeded()
- pwsh: |
$setDailyDevBuild = "false"
if (('$(Build.Reason)' -eq 'Schedule') -and ('$(System.TeamProject)' -eq 'internal')) {
Expand Down
8 changes: 4 additions & 4 deletions eng/common/scripts/Create-APIReview.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ foreach ($pkgName in $responses.Keys)
$FoundFailure = $True
if ($respCode -eq '201')
{
Write-Host "API Review is pending for package $($PackageName)"
Write-Error "Automatic API Review approval is pending for package $($PackageName)"
}
else
{
Write-Host "Failed to create API Review for package $($PackageName)"
Write-Error "Failed to create API Review for package $($PackageName)"
}
}
else
Expand All @@ -123,6 +123,6 @@ foreach ($pkgName in $responses.Keys)
}
if ($FoundFailure)
{
Write-Host "Automatic API review is not yet approved for package $($PackageName)"
exit(1)
Write-Error "Automatic API review is not yet approved for package $($PackageName)"
exit 1
}
29 changes: 16 additions & 13 deletions eng/common/scripts/Save-Package-Properties.ps1
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
[CmdletBinding()]
Param (
[Parameter(Mandatory=$True)]
[string] $serviceName,
[string] $serviceDirectory,
[Parameter(Mandatory=$True)]
[string] $OutDirectory
[string] $outDirectory
)

. (Join-Path $PSScriptRoot common.ps1)
$allPackageProperties = Get-AllPkgProperties $serviceName
$allPackageProperties = Get-AllPkgProperties $serviceDirectory
if ($allPackageProperties)
{
New-Item -ItemType Directory -Force -Path $OutDirectory
New-Item -ItemType Directory -Force -Path $outDirectory
foreach($pkg in $allPackageProperties)
{
Write-Host "Package Name: $($pkg.Name)"
Write-Host "Package Version: $($pkg.Version)"
Write-Host "Package SDK Type: $($pkg.SdkType)"
$outputPath = Join-Path -Path $OutDirectory ($pkg.Name + ".json")
$outputObject = $pkg | ConvertTo-Json
Set-Content -Path $outputPath -Value $outputObject
if ($pkg.IsNewSDK)
{
Write-Host "Package Name: $($pkg.Name)"
Write-Host "Package Version: $($pkg.Version)"
Write-Host "Package SDK Type: $($pkg.SdkType)"
$outputPath = Join-Path -Path $outDirectory ($pkg.Name + ".json")
$outputObject = $pkg | ConvertTo-Json
Set-Content -Path $outputPath -Value $outputObject
}
}

Get-ChildItem -Path $OutDirectory
Get-ChildItem -Path $outDirectory
}
else
{
Write-Host "Package properties are not available for service directory $($serviceName)"
exit(1)
Write-Error "Package properties are not available for service directory $($serviceDirectory)"
exit 1
}

0 comments on commit 1cd9a9d

Please sign in to comment.