Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions tools/releaseBuild/azureDevOps/diagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ folder "Package Signing and Upload" as PkgSignUpload {
agent "Windows" as SignWin
}

folder "Build Test Artifacts" as TestArtifacts {
agent "Windows" as WinTest
agent "Linux" as LinuxTest
}

agent "Compliance" as Compliance

Expand Down Expand Up @@ -79,6 +83,7 @@ UploadLinuxFx ~~ Finish
SignMac ~~ Finish
BuildCG ~~ Finish
BuildNuGet ~~ Finish
TestArtifacts ~~ Finish

Start ~~ BuildDEB
Start ~~ BuildRPM
Expand All @@ -91,5 +96,6 @@ Start ~~ BuildWinFx
Start ~~ BuildWinArm32
Start ~~ BuildWinArm64
Start ~~ BuildCG
Start ~~ TestArtifacts

@enduml
8 changes: 7 additions & 1 deletion tools/releaseBuild/azureDevOps/diagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions tools/releaseBuild/azureDevOps/releaseBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,13 @@ jobs:
- build_rpm
- build_alpine
- build_macOS

- template: templates/testartifacts.yml
parameters:
buildName: windows
pool: Hosted VS2017

- template: templates/testartifacts.yml
parameters:
buildName: linux
pool: Hosted Ubuntu 1604
38 changes: 38 additions & 0 deletions tools/releaseBuild/azureDevOps/templates/testartifacts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
parameters:
buildName: 'linux'
pool: 'Hosted Ubuntu 1604'

jobs:
- job: build_testartifacts_${{ parameters.buildName }}
displayName: Build test artifacts ${{ parameters.buildName }}
condition: succeeded()
pool: ${{ parameters.pool }}
steps:

- pwsh: |
Import-Module ./build.psm1
Start-PSBootstrap
displayName: Bootstrap

- pwsh: |
Import-Module ./build.psm1
New-TestPackage -Destination $(System.ArtifactsDirectory)
displayName: Build test package

- pwsh: |
if (-not (Test-Path $(System.ArtifactsDirectory)/TestPackage.zip))
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggestion: Maybe some of this PowerShell block should be moved into a new function in ./tools/ci.psm1

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This is not for CI so, this does not belong in ci.psm1

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It would be good if in the future we had a similar module for release builds.

{
throw "Test Package was not found at: $(System.ArtifactsDirectory)"
}

$packageName = if ($IsWindows) {
"TestPackage-win.zip"
}
else {
"TestPackage-linux.zip"
}

Rename-Item $(System.ArtifactsDirectory)/TestPackage.zip $packageName

Write-Host "##vso[artifact.upload containerfolder=testArtifacts;artifactname=testArtifacts]$(System.ArtifactsDirectory)/$packageName"
displayName: Upload to build artifacts