From 90d46b450a05d22ce372dbe91ee1c623b94cdead Mon Sep 17 00:00:00 2001
From: stlivada <stefan.livadariu@silabs.com>
Date: Fri, 17 Jan 2025 17:22:24 -0500
Subject: [PATCH] save folder, download into sqa-build-binaries directly

---
 .github/workflows/generate-and-build.yaml | 12 +++++++-----
 .github/workflows/sqa-build.yaml          | 10 ++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/generate-and-build.yaml b/.github/workflows/generate-and-build.yaml
index 4bb54cc4..5d777374 100644
--- a/.github/workflows/generate-and-build.yaml
+++ b/.github/workflows/generate-and-build.yaml
@@ -133,9 +133,12 @@ jobs:
           export POST_BUILD_EXE=${{ env.POST_BUILD_EXE }}
           make all -C ${MATTER_EXTN_ROOT}/${{ inputs.board }}/${{ inputs.app }}-${{ inputs.suffix }} -f ${WORKSPACE_PATH}.solution.Makefile -j8
 
-#      - name: Save Artifact Path
-#        id: save_artifact_path
-#        run: echo "ARTIFACT_${{ inputs.appType }}_${{ inputs.board }}_${{ inputs.technology }}_${{ inputs.app }}=${{ inputs.appType }}_${{ inputs.board }}_${{ inputs.technology }}_${{ inputs.app }}" >> $GITHUB_ENV
+      - name: Create directory and move artifact inside
+        run: |
+          FILE_PATH=out/${{ inputs.appType }}/${{ inputs.board }}/${{ inputs.technology }}/${{ inputs.app }}
+          ARTIFACT=${{ env.MATTER_EXTN_ROOT }}/${{ inputs.board }}/${{ inputs.app }}-${{ inputs.suffix }}/${{ inputs.app }}-${{ inputs.suffix }}/build/debug/${{ inputs.app }}-${{ inputs.suffix }}.s37
+          mkdir -p $FILE_PATH
+          mv $ARTIFACT $FILE_PATH
 
       - name: Upload SQA Build Artifact
         id: upload_artifact
@@ -143,11 +146,10 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.appType }}_${{ inputs.board }}_${{ inputs.technology }}_${{ inputs.app }}
-          path: ${{ env.MATTER_EXTN_ROOT }}/${{ inputs.board }}/${{ inputs.app }}-${{ inputs.suffix }}/${{ inputs.app }}-${{ inputs.suffix }}/build/debug/${{ inputs.app }}-${{ inputs.suffix }}.s37
+          path: out
       - name: Set Output Variables
         run: | 
           echo "artifact_name=${{ inputs.appType }}_${{ inputs.board }}_${{ inputs.technology }}_${{ inputs.app }}" >> $GITHUB_OUTPUT
-#          echo "artifact_path=sqa-build-binaries/out/${{ inputs.app }}_${{ inputs.board }}_${{ inputs.suffix }}" >> $GITHUB_OUTPUT
       - name: Upload Artifactory
         if: ${{ inputs.workflowName != 'SQA Build' }}
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/sqa-build.yaml b/.github/workflows/sqa-build.yaml
index c3e71179..f24ff653 100644
--- a/.github/workflows/sqa-build.yaml
+++ b/.github/workflows/sqa-build.yaml
@@ -41,11 +41,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Create SQA Build Binaries Top Folder
+        run: mkdir -p sqa-build-binaries
+
       - name: Download artifacts into out file
         run: |
-          mkdir -p out
           for job in lto; do
-            gh run download -n ${{ needs[job].outputs.artifact_name }} -D out
+            gh run download -n ${{ needs[job].outputs.artifact_name }} -D sqa-build-binaries
           done
 #          for artifact in $(printenv | grep ARTIFACT_ | sed 's/.*=//'); do
 #            echo "Processing artifact: $artifact"
@@ -59,8 +61,8 @@ jobs:
       - name: Debug List Created Directories
         run: ls -R out
 
-      - name: Create SQA Build Binaries Top Folder
-        run: mkdir -p sqa-build-binaries
+#      - name: Create SQA Build Binaries Top Folder
+#        run: mkdir -p sqa-build-binaries
 
       - name: Move Artifacts to New Folder
         run: |