diff options
author | Steven Koo <steven.koo@ni.com> | 2021-07-30 13:38:05 -0500 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-08-04 15:22:12 -0500 |
commit | 0a1be828cbc1d311eb48201ebc45dfb24ce82849 (patch) | |
tree | 9e480e42d527a37645253ea5000526dfcae7b514 /.ci/templates/job-uhd-build-src.yml | |
parent | 699982eef8b29da7f94fa6d0b8216d660aa8fe40 (diff) | |
download | uhd-0a1be828cbc1d311eb48201ebc45dfb24ce82849.tar.gz uhd-0a1be828cbc1d311eb48201ebc45dfb24ce82849.tar.bz2 uhd-0a1be828cbc1d311eb48201ebc45dfb24ce82849.zip |
ci: Refactor installers and add Windows support
This commit refactors the uhd pipeline to have a new installer stage.
This also adds Windows NSIS installers to pipelines.
Signed-off-by: Steven Koo <steven.koo@ni.com>
Diffstat (limited to '.ci/templates/job-uhd-build-src.yml')
-rw-r--r-- | .ci/templates/job-uhd-build-src.yml | 56 |
1 files changed, 23 insertions, 33 deletions
diff --git a/.ci/templates/job-uhd-build-src.yml b/.ci/templates/job-uhd-build-src.yml index 25f8b4897..ea3abbede 100644 --- a/.ci/templates/job-uhd-build-src.yml +++ b/.ci/templates/job-uhd-build-src.yml @@ -7,11 +7,12 @@ parameters: - make_trace - ninja - msbuild - - ubuntu_deb - name: 'custom_boost_version_url' type: string default: 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2' - +- name: release_binaries + type: boolean + default: false jobs: - job: build_ctest_and_upload_uhd_${{ parameters.toolset }} @@ -42,14 +43,9 @@ jobs: matrix: $[ variables.dockerImageMatrixWin ] ${{ if or(eq(parameters.toolset, 'make'), eq(parameters.toolset, 'make_trace'), eq(parameters.toolset, 'ninja'), eq(parameters.toolset, 'make_custom_boost_version')) }}: matrix: $[ variables.dockerImageMatrixLin ] - ${{ if eq(parameters.toolset, 'ubuntu_deb') }}: - matrix: $[ variables.dockerImageMatrixUbuntuDeb ] container: image: '$(dockerImagePrefix)$(DockerImageName):$(dockerBuildNumber)' endpoint: 'Docker / Artifactory - rnd-builds-local' - ${{ if eq(parameters.toolset, 'ubuntu_deb') }}: - #pbuilder requires access to /proc - options: --privileged steps: - checkout: self clean: true @@ -59,39 +55,34 @@ jobs: - ${{ if eq(parameters.toolset, 'make') }}: - template: steps-build-uhd-make.yml parameters: - uhdSrcDir: $(Build.SourcesDirectory) + uhdSrcDir: ../../../s uhdBuildDir: $(Build.BinariesDirectory)/uhddev/build - ${{ if eq(parameters.toolset, 'make_trace') }}: - template: steps-build-uhd-make.yml parameters: - uhdSrcDir: $(Build.SourcesDirectory) + uhdSrcDir: ../../../s uhdBuildDir: $(Build.BinariesDirectory)/uhddev/build uhdEnableTraceLog: true - ${{ if eq(parameters.toolset, 'ninja') }}: - template: steps-build-uhd-ninja.yml parameters: - uhdSrcDir: $(Build.SourcesDirectory) + uhdSrcDir: ../../../s uhdBuildDir: $(Build.BinariesDirectory)/uhddev/build - ${{ if eq(parameters.toolset, 'msbuild') }}: - template: steps-build-uhd-msbuild.yml parameters: - uhdSrcDir: $(Build.SourcesDirectory) - uhdBuildDir: $(Build.BinariesDirectory)\uhddev\build + uhdSrcDir: ../../../s + uhdBuildDir: $(Build.BinariesDirectory)\\uhddev\\build + uhdImageDir: $(Build.BinariesDirectory)\\uhd-images + uhdReleaseBinaries: ${{ parameters.release_binaries }} cmakeCompiler: $(cmakeCompiler) cmakeArch: $(cmakeArch) vsArch: $(vsArch) vsYear: $(vsYear) - - ${{ if eq(parameters.toolset, 'ubuntu_deb') }}: - - template: steps-build-uhd-ubuntu-deb.yml - parameters: - uhdSrcDir: $(Build.SourcesDirectory) - uhdBuildDir: $(Build.BinariesDirectory)/uhddev - ubuntuReleaseName: $(ubuntuReleaseName) - - ${{ if eq(parameters.toolset, 'make_custom_boost_version') }}: - template: steps-build-uhd-make.yml parameters: @@ -122,18 +113,17 @@ jobs: artifactName: '$(dockerOSName)-${{ parameters.toolset }}' displayName: Upload uhd build artifacts - - ${{ if ne(parameters.toolset, 'ubuntu_deb') }}: - - task: CopyFiles@2 - inputs: - sourceFolder: $(Build.BinariesDirectory)/uhddev/ - contents: build/Testing/** - targetFolder: $(Common.TestResultsDirectory) - displayName: Copy ${{ parameters.toolset }} ctest results + - task: CopyFiles@2 + inputs: + sourceFolder: $(Build.BinariesDirectory)/uhddev/ + contents: build/Testing/** + targetFolder: $(Common.TestResultsDirectory) + displayName: Copy ${{ parameters.toolset }} ctest results - - task: PublishTestResults@2 - inputs: - testResultsFormat: cTest - testResultsFiles: $(Common.TestResultsDirectory)/build/Testing/**/Test.xml - failTaskOnFailedTests: true - testRunTitle: uhd ctest $(dockerOSName)-${{ parameters.toolset }} - displayName: Publish $(dockerOSName)-${{ parameters.toolset }} ctest results + - task: PublishTestResults@2 + inputs: + testResultsFormat: cTest + testResultsFiles: $(Common.TestResultsDirectory)/build/Testing/**/Test.xml + failTaskOnFailedTests: true + testRunTitle: uhd ctest $(dockerOSName)-${{ parameters.toolset }} + displayName: Publish $(dockerOSName)-${{ parameters.toolset }} ctest results |