Skip to content

Release pipeline fixes #13473

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
daxian-dbw merged 3 commits into from
Aug 18, 2020
Merged

Release pipeline fixes #13473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cf4204
Merged PR 12343: Fix paths for nuget package release
adityapatwardhan Aug 18, 2020
f495cac
Merged PR 12344: Fix typo in package name for pwsh.deps.json upload task
adityapatwardhan Aug 18, 2020
e0738c1
Merged PR 12345: Fix blobprefix and nuget package path
adityapatwardhan Aug 18, 2020
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
7 changes: 4 additions & 3 deletions tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@ steps:

- pwsh: |
#Exclude all global tool packages. Their names start with 'PowerShell.'
Copy-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force
$null = New-Item -ItemType Directory -Path "$(Pipeline.Workspace)/release"
Copy-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force -Verbose
Copy link
Collaborator

@rjmholt rjmholt Aug 18, 2020

Choose a reason for hiding this comment

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

Seeing our inclusion of -Verbose here, makes me think it would be really nice if we just had a variable we could set to make the whole build spit out verbose PowerShell output. But it does also make sense as a default

Copy link
Member Author

@adityapatwardhan adityapatwardhan Aug 18, 2020

Choose a reason for hiding this comment

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

Getting all verbose can be too much sometimes. Specially with import-module etc.

Copy link
Member Author

@adityapatwardhan adityapatwardhan Aug 18, 2020

Choose a reason for hiding this comment

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

Its more for logging what gets copied to where.


$releaseVersion = Get-Content "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" | ConvertFrom-Json | Select-Object -ExpandProperty 'ReleaseVersion'
$globalToolPath = "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell.$releaseVersion.nupkg"
### -WhatIf to make sure we do not release global tool. Remove -WhatIf when the PowerShell name reservation is done.
Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release" -WhatIf

Get-ChildItem "$(Pipeline.Workspace)"
Get-ChildItem "$(Pipeline.Workspace)/release" -recurse
displayName: Download and capture nupkgs

- task: NuGetCommand@2
displayName: 'NuGet push'
inputs:
command: push
packagesToPush: '$(Agent.ReleaseDirectory)/*.nupkg'
packagesToPush: '$(Pipeline.Workspace)/release/*.nupkg'
nuGetFeedType: external
publishFeedCredentials: PowerShellNuGetOrgPush
7 changes: 5 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,18 @@ jobs:
throw "Unexpected fileName: $fileName"
}

$vstsCommand = "vso[task.setvariable variable=ContainerName]$fileName"
$vstsCommand = "vso[task.setvariable variable=BlobPrefix]$fileName"
Write-Verbose -Verbose $vstsCommand
Write-Host "##$vstsCommand"
displayName: Determine container name

- pwsh: |
$zipFile = (Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell*-winx64.zip")
$zipFile = (Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell*-win-x64.zip")
Expand-Archive -Path $zipFile -Destination "$ENV:PIPELINE_WORKSPACE/expanded"

$pwshDepsFile = Get-Item "$ENV:PIPELINE_WORKSPACE/expanded/pwsh.deps.json"
$vstsCommand = "vso[task.setvariable variable=FileToUpload]$pwshDepsFile"
Write-Verbose -Verbose $vstsCommand
Write-Host "##$vstsCommand"
displayName: Determine file to upload

Expand All @@ -41,3 +43,4 @@ jobs:
Destination: AzureBlob
storage: '$(StorageAccount)'
ContainerName: ps-deps-json
blobPrefix: '$(BlobPrefix)'