From 390bb026037eec6b862fe3e9a9644658c0597a1c Mon Sep 17 00:00:00 2001
From: Manikandan Subramaniam
 <113734488+manikandan-xilinx@users.noreply.github.com>
Date: Sun, 4 Aug 2024 16:59:29 -0700
Subject: [PATCH] CI/CD: Fixing the cleanup step failure for 2024.1 branch
 (#8329)

* adding release input to setenv composite action

* fix the version number for cleanup

* Adding release variable for 2024.1
---
 .github/workflows/xrt_master.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/xrt_master.yml b/.github/workflows/xrt_master.yml
index d0f21ae9cf6..fd48224b98a 100644
--- a/.github/workflows/xrt_master.yml
+++ b/.github/workflows/xrt_master.yml
@@ -596,7 +596,8 @@ jobs:
         uses: ./composite-workflows/gradle-artifactory-upload   
         with:    
           runNumber: ${{ env.XRT_VERSION_PATCH }}    
-          pipeline: ${{ env.PIPELINE }}    
+          pipeline: ${{ env.PIPELINE }}
+          release: ${{ env.RELEASE }}    
           env: ${{ env.ENV }}
           workspace: ${{ github.workspace }}  
           buildNumber: ${{ env.XRT_VERSION_PATCH }} 
@@ -610,6 +611,14 @@ jobs:
     needs: [Release_to_all_sites, gradle-artifactory-upload]    
     runs-on: [self-hosted, Ubuntu-22.04]    
     steps:    
+
+      - name: Set env variables    
+        run: |    
+          echo "Setting environment variables..."      
+          # echo "XRT_VERSION_PATCH=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+          echo "XRT_VERSION_PATCH=$(($GITHUB_RUN_NUMBER+210))" >> $GITHUB_ENV    
+          echo "PATH=/usr/bin:$PATH" >> $GITHUB_ENV 
+
       - name: Checkout private repository    
         uses: actions/checkout@v3 
         with:    
@@ -622,7 +631,7 @@ jobs:
       - name: Use composite action package download     
         uses: ./composite-workflows/cleanup   
         with:    
-          runNumber: ${{ github.run_number }}    
+          runNumber: ${{ env.XRT_VERSION_PATCH }}    
           pipeline: ${{ env.PIPELINE }}    
           env: ${{ env.ENV }}
           release: ${{ env.RELEASE }}