From 4a8150df4fe11f824a36de0a9c50c972031413a6 Mon Sep 17 00:00:00 2001
From: mattprost <matt.prost@ni.com>
Date: Thu, 16 Jun 2022 10:51:52 -0500
Subject: ci: Only include rpm files in the Fedora installer artifacts

Signed-off-by: mattprost <matt.prost@ni.com>
---
 .ci/templates/job-uhd-build-installer.yml              |  1 +
 .ci/templates/steps-build-uhd-installer-fedora-rpm.yml | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.ci/templates/job-uhd-build-installer.yml b/.ci/templates/job-uhd-build-installer.yml
index fd99a79de..1c22bf9cb 100644
--- a/.ci/templates/job-uhd-build-installer.yml
+++ b/.ci/templates/job-uhd-build-installer.yml
@@ -68,6 +68,7 @@ jobs:
     - template: steps-build-uhd-installer-fedora-rpm.yml
       parameters:
         uhdSrcDir: $(Build.SourcesDirectory)
+        uhdBuildDir: $(Build.BinariesDirectory)/uhddev/build
         uhdInstallerDir: $(Build.BinariesDirectory)/uhddev-installer
         fedoraReleaseName: $(fedoraReleaseName)
         releaseBinaries: ${{ parameters.releaseBinaries }}
diff --git a/.ci/templates/steps-build-uhd-installer-fedora-rpm.yml b/.ci/templates/steps-build-uhd-installer-fedora-rpm.yml
index 95536c130..7933acf3f 100644
--- a/.ci/templates/steps-build-uhd-installer-fedora-rpm.yml
+++ b/.ci/templates/steps-build-uhd-installer-fedora-rpm.yml
@@ -1,6 +1,8 @@
 parameters:
 - name: uhdSrcDir
   type: string
+- name: uhdBuildDir
+  type: string
 - name: uhdInstallerDir
   type: string
 - name: fedoraReleaseName
@@ -11,8 +13,9 @@ parameters:
 
 steps:
 - script: |
+    mkdir -p ${{ parameters.uhdBuildDir }}
     mkdir -p ${{ parameters.uhdInstallerDir }}
-    cd ${{ parameters.uhdInstallerDir}}
+    cd ${{ parameters.uhdBuildDir}}
     if [[ "${{ parameters.releaseBinaries }}" = "True" ]]; then
       echo "Setting UHD_RELEASE_MODE to release"
       export UHD_CI_CMAKE_OPTIONS="-DUHD_RELEASE_MODE=release $UHD_CI_CMAKE_OPTIONS"
@@ -27,6 +30,14 @@ steps:
   displayName: cmake rpm
 
 - script: |
-    cd ${{ parameters.uhdInstallerDir}}
+    cd ${{ parameters.uhdBuildDir }}
     make package -j$(nproc)
   displayName: make package rpm
+
+- task: CopyFiles@2
+  inputs:
+    sourceFolder: ${{ parameters.uhdBuildDir }}
+    contents: 'uhd*.rpm'
+    targetFolder: ${{ parameters.uhdInstallerDir }}
+    cleanTargetFolder: true
+  displayName: Copy rpm installer
-- 
cgit v1.2.3