From 6708df6e153f7cee7b85479c3d64fe041f9415b7 Mon Sep 17 00:00:00 2001 From: Matthew Crymble Date: Tue, 6 Feb 2024 14:24:29 -0600 Subject: ci: skip building installer for Ubuntu 18.04 We have a single control file for all of our Debian installers. It lists several OS package dependencies for python modules, like python3-numpy. Python 3.7 versions of these don't exist in Ubuntu 18.04. These python dependencies can be installed via pip instead. Rather than maintain a separate control file for the Ubuntu 18.04 installer, we'll skip building it althogether. --- .ci/templates/job-uhd-build-installer.yml | 3 +++ .ci/templates/steps-build-uhd-installer-ubuntu-deb.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.ci/templates/job-uhd-build-installer.yml b/.ci/templates/job-uhd-build-installer.yml index 469853094..4dbb6e851 100644 --- a/.ci/templates/job-uhd-build-installer.yml +++ b/.ci/templates/job-uhd-build-installer.yml @@ -72,8 +72,10 @@ jobs: steps: - checkout: self clean: true + condition: and(succeeded(), ne(variables.buildOSName, 'ubuntu1804')) - download: uhd_build_docker_container + condition: and(succeeded(), ne(variables.buildOSName, 'ubuntu1804')) - ${{ if eq(parameters.toolset, 'fedora_rpm') }}: - template: steps-build-uhd-installer-fedora-rpm.yml parameters: @@ -124,3 +126,4 @@ jobs: targetPath: '$(Build.BinariesDirectory)/uhddev-installer' artifactName: 'uhddev-$(buildOSName)-${{ parameters.toolset }}-${{ parameters.installer }}-installer' displayName: Upload uhd installer artifact + condition: and(succeeded(), ne(variables.buildOSName, 'ubuntu1804')) diff --git a/.ci/templates/steps-build-uhd-installer-ubuntu-deb.yml b/.ci/templates/steps-build-uhd-installer-ubuntu-deb.yml index 98a3ac556..630219c90 100644 --- a/.ci/templates/steps-build-uhd-installer-ubuntu-deb.yml +++ b/.ci/templates/steps-build-uhd-installer-ubuntu-deb.yml @@ -10,8 +10,10 @@ steps: - script: | sudo pbuilder create --debootstrapopts --variant=buildd --distribution ${{ parameters.ubuntuReleaseName }} displayName: Setup pbuilder + condition: and(succeeded(), ne(variables['buildOSName'], 'ubuntu1804')) - script: | mkdir -p ${{ parameters.uhdInstallerDir }} cd ${{ parameters.uhdSrcDir }} python3 tools/debs/uhd_ubuntu_deb.py ${{ parameters.ubuntuReleaseName }} --buildpath ${{ parameters.uhdInstallerDir }} displayName: Build dsc and debs + condition: and(succeeded(), ne(variables['buildOSName'], 'ubuntu1804')) -- cgit v1.2.3-59-g8ed1b