Skip to content

Fixes to release pipeline for GA release #14034

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
adityapatwardhan merged 1 commit into from
Nov 11, 2020
Merged

Fixes to release pipeline for GA release #14034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions test/hosting/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet5-rtm" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/5.0.100-rtm.20526.5/nuget/v3/index.json" />
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
Expand Down
12 changes: 10 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
steps:
- download: releasePipeline
artifact: BuildInfoJson
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: PowerShellCore
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: BuildInfoJson
path: '$(Pipeline.Workspace)/releasePipeline/BuildInfoJson'

- pwsh: |
$jsonFile = Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/BuildInfoJson/*.json"
Expand Down
24 changes: 10 additions & 14 deletions tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,17 @@ jobs:
- checkout: self
clean: true

- download: releasePipeline
artifact: finalResults
patterns: '**/*.nupkg'

- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
inputs:
buildType: specific
source: specific
project: PowerShellCore
pipeline: Co-ordinated Build Test
specificBuildWithTriggering: true
buildVersionToDownload: latest
downloadType: single
artifactName: finalResults
downloadPath: '$(Pipeline.Workspace)'
itemPattern: '*.nupkg'
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: finalResults
patterns: '**/*.nupkg'
path: '$(Pipeline.Workspace)/releasePipeline/finalResults'

- pwsh: |
$dotnetMetadataPath = "$(Build.SourcesDirectory)/DotnetRuntimeMetadata.json"
Expand Down Expand Up @@ -60,7 +56,7 @@ jobs:
displayName: Install .NET

- pwsh: |
$branch = $ENV:RESOURCES_PIPELINE_RELEASEPIPELINE_SOURCEBRANCH
$branch = $ENV:BUILD_SOURCEBRANCH
$version = $branch -replace '^.*(release[-/])v'
$vstsCommandString = "vso[task.setvariable variable=PowerShellVersion]$version"
Write-Verbose -Message "Version is $version" -Verbose
Expand Down
12 changes: 10 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,16 @@ steps:
git clone https://$(AzureDevOpsPat)@mscodehub.visualstudio.com/PowerShellCore/_git/Internal-PowerShellTeam-Tools '$(Pipeline.Workspace)/tools'
displayName: Clone Internal-PowerShellTeam-Tools from MSCodeHub

- download: releasePipeline
artifact: metadata
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: PowerShellCore
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: metadata
path: '$(Pipeline.Workspace)/releasePipeline/metadata'

- pwsh: |
$metadata = Get-Content -Path "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" -Raw | ConvertFrom-Json
Expand Down
26 changes: 21 additions & 5 deletions tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
steps:
- download: releasePipeline
artifact: finalResults
patterns: "**/*.nupkg"
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: PowerShellCore
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: finalResults
patterns: '**/*.nupkg'
path: '$(Pipeline.Workspace)/releasePipeline/finalResults'

- download: releasePipeline
artifact: metadata
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: PowerShellCore
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: metadata
path: '$(Pipeline.Workspace)/releasePipeline/metadata'

- pwsh: |
#Exclude all global tool packages. Their names start with 'PowerShell.'
Expand Down
28 changes: 22 additions & 6 deletions tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,28 @@ jobs:
- checkout: self
clean: true

- download: releasePipeline
artifact: finalResults
patterns: '**/*.nupkg'

- download: releasePipeline
artifact: metadata
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: PowerShellCore
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: finalResults
patterns: '**/*.nupkg'
path: '$(Pipeline.Workspace)/releasePipeline/finalResults'

- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: PowerShellCore
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: metadata
path: '$(Pipeline.Workspace)/releasePipeline/metadata'

- pwsh: |
$dotnetMetadataPath = "$(Build.SourcesDirectory)/DotnetRuntimeMetadata.json"
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/release-SetReleaseTagAndContainerName.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
steps:
- pwsh: |
$variable = 'releaseTag'
$branch = $ENV:RESOURCES_PIPELINE_RELEASEPIPELINE_SOURCEBRANCH
$branch = $ENV:BUILD_SOURCEBRANCH
if($branch -notmatch '^.*(release[-/])')
{
throw "Branch name is not in release format: '$branch'"
Expand Down
26 changes: 21 additions & 5 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 @@ -9,12 +9,28 @@ jobs:
- checkout: self
clean: true

- download: releasePipeline
artifact: finalResults
patterns: '**/PowerShell*-win-x64.zip'
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: PowerShellCore
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: finalResults
patterns: '**/PowerShell*-win-x64.zip'
path: '$(Pipeline.Workspace)/releasePipeline/finalResults'

- download: releasePipeline
artifact: BuildInfoJson
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: PowerShellCore
pipeline: '696'
preferTriggeringPipeline: true
runVersion: latestFromBranch
runBranch: '$(Build.SourceBranch)'
artifact: BuildInfoJson
path: '$(Pipeline.Workspace)/releasePipeline/BuildInfoJson'

- pwsh: |
$fileName = (Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/BuildInfoJson/*.json").BaseName
Expand Down