diff options
| -rw-r--r-- | .ci/templates/job-uhd-build-installer.yml | 6 | ||||
| -rw-r--r-- | .ci/templates/steps-build-uhd-installer-fedora-rpm.yml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.ci/templates/job-uhd-build-installer.yml b/.ci/templates/job-uhd-build-installer.yml index 4dbb6e851..591180615 100644 --- a/.ci/templates/job-uhd-build-installer.yml +++ b/.ci/templates/job-uhd-build-installer.yml @@ -72,10 +72,10 @@ jobs: steps: - checkout: self clean: true - condition: and(succeeded(), ne(variables.buildOSName, 'ubuntu1804')) + condition: and(succeeded(), not(in(variables.buildOSName, 'ubuntu1804', 'fedora39'))) - download: uhd_build_docker_container - condition: and(succeeded(), ne(variables.buildOSName, 'ubuntu1804')) + condition: and(succeeded(), not(in(variables.buildOSName, 'ubuntu1804', 'fedora39'))) - ${{ if eq(parameters.toolset, 'fedora_rpm') }}: - template: steps-build-uhd-installer-fedora-rpm.yml parameters: @@ -126,4 +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')) + condition: and(succeeded(), not(in(variables.buildOSName, 'ubuntu1804', 'fedora39'))) diff --git a/.ci/templates/steps-build-uhd-installer-fedora-rpm.yml b/.ci/templates/steps-build-uhd-installer-fedora-rpm.yml index 7933acf3f..bb09c5767 100644 --- a/.ci/templates/steps-build-uhd-installer-fedora-rpm.yml +++ b/.ci/templates/steps-build-uhd-installer-fedora-rpm.yml @@ -28,11 +28,13 @@ steps: -G "Unix Makefiles" \ ${{ parameters.uhdSrcDir }}/host displayName: cmake rpm + condition: and(succeeded(), not(in(variables.buildOSName, 'fedora39'))) - script: | cd ${{ parameters.uhdBuildDir }} make package -j$(nproc) displayName: make package rpm + condition: and(succeeded(), not(in(variables.buildOSName, 'fedora39'))) - task: CopyFiles@2 inputs: @@ -41,3 +43,4 @@ steps: targetFolder: ${{ parameters.uhdInstallerDir }} cleanTargetFolder: true displayName: Copy rpm installer + condition: and(succeeded(), not(in(variables.buildOSName, 'fedora39'))) |