diff options
| author |   Martin Braun <martin.braun@ettus.com> | 2023-07-14 10:16:24 +0200 |
|---|---|---|
| committer |   Aki Tomita <121511582+atomita-ni@users.noreply.github.com> | 2023-07-24 14:59:04 -0500 |
| commit | 1ad773a46f84d849eba1b8cf879a25a2e03c20c7 (patch) | |
| tree | 76823c6db72539c70dadec6f57ffb59843511d2b | |
| parent | fpga: x440: fbx: clean up I2C triggers (diff) | |
| download | uhd-1ad773a46f84d849eba1b8cf879a25a2e03c20c7.tar.xz uhd-1ad773a46f84d849eba1b8cf879a25a2e03c20c7.zip | |
ci: Allow internal fileserver usage for MS installer builds
| -rw-r--r-- | .ci/templates/job-uhd-build-installer.yml | 7 | ||||
| -rw-r--r-- | .ci/templates/stages-uhd-pipeline.yml | 2 | ||||
| -rw-r--r-- | .ci/templates/steps-build-uhd-installer-msbuild-nsis.yml | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/.ci/templates/job-uhd-build-installer.yml b/.ci/templates/job-uhd-build-installer.yml index 45ad0d3a0..d910699d2 100644 --- a/.ci/templates/job-uhd-build-installer.yml +++ b/.ci/templates/job-uhd-build-installer.yml @@ -17,6 +17,9 @@ parameters: - name: releaseBinaries type: boolean default: false +- name: fpga_imgs_base_url + type: string + default: 'Internal' jobs: - job: build_uhd_installer_${{ parameters.toolset }} @@ -92,6 +95,8 @@ jobs: uhdInstallerDir: $(Build.BinariesDirectory)\\uhddev-installer uhdImageDir: $(Build.BinariesDirectory)\\uhd-images uhdReleaseBinaries: ${{ parameters.releaseBinaries }} + ${{ if contains(parameters.fpga_imgs_base_url, 'Internal') }}: + uhdImagesDownloaderExtraArgs: '-b $(InternalFileServerUrl)' cmakeCompiler: $(cmakeCompiler) cmakeArch: $(cmakeArch) vsArch: $(vsArch) @@ -105,6 +110,8 @@ jobs: uhdImageDir: $(Build.BinariesDirectory)\\uhd-images uhdReleaseBinaries: ${{ parameters.releaseBinaries }} uhdBuildPythonAPI: True + ${{ if contains(parameters.fpga_imgs_base_url, 'Internal') }}: + uhdImagesDownloaderExtraArgs: '-b $(InternalFileServerUrl)' cmakeCompiler: $(cmakeCompiler) cmakeArch: $(cmakeArch) vsArch: $(vsArch) diff --git a/.ci/templates/stages-uhd-pipeline.yml b/.ci/templates/stages-uhd-pipeline.yml index 409c09840..ec07c10c1 100644 --- a/.ci/templates/stages-uhd-pipeline.yml +++ b/.ci/templates/stages-uhd-pipeline.yml @@ -347,10 +347,12 @@ stages: toolset: msbuild installer: nsis releaseBinaries: ${{ parameters.release_binaries }} + fpga_imgs_base_url: ${{ parameters.fpga_imgs_base_url }} - template: job-uhd-build-installer.yml parameters: toolset: msbuild_python installer: nsis + fpga_imgs_base_url: ${{ parameters.fpga_imgs_base_url }} - ${{ if parameters.release_binaries }}: - template: job-uhd-build-installer-signing.yml parameters: diff --git a/.ci/templates/steps-build-uhd-installer-msbuild-nsis.yml b/.ci/templates/steps-build-uhd-installer-msbuild-nsis.yml index 2bc23b5ff..ca077f109 100644 --- a/.ci/templates/steps-build-uhd-installer-msbuild-nsis.yml +++ b/.ci/templates/steps-build-uhd-installer-msbuild-nsis.yml @@ -13,6 +13,9 @@ parameters: - name: uhdBuildPythonAPI type: boolean default: false +- name: uhdImagesDownloaderExtraArgs + type: string + default: "" - name: cmakeCompiler type: string - name: cmakeArch @@ -30,7 +33,7 @@ steps: -DVCPKG_TARGET_TRIPLET=uhd-$(vsArch)-windows-static-md ^ -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALL_DIR%/scripts/buildsystems/vcpkg.cmake mkdir ${{ parameters.uhdImageDir }} - python ${{ parameters.uhdBuildDir }}/utils/uhd_images_downloader.py -i ${{ parameters.uhdImageDir }} + python ${{ parameters.uhdBuildDir }}/utils/uhd_images_downloader.py -i ${{ parameters.uhdImageDir }} ${{ parameters.uhdImagesDownloaderExtraArgs }} displayName: Download uhd-images timeoutInMinutes: 30 |