From 9654e30b3463964b40d4baea8507dc2fe4d33871 Mon Sep 17 00:00:00 2001
From: kylezs <zsembery.kyle@gmail.com>
Date: Wed, 27 Nov 2024 08:52:59 +0100
Subject: [PATCH] fix: flatten upload structure

---
 .github/workflows/_20_build.yml      | 8 +++++++-
 .github/workflows/_21_build_m2.yml   | 8 +++++++-
 .github/workflows/_40_post_check.yml | 2 +-
 .github/workflows/_60_upload.yml     | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/_20_build.yml b/.github/workflows/_20_build.yml
index d7e65e1704..6f7f8dcdf4 100644
--- a/.github/workflows/_20_build.yml
+++ b/.github/workflows/_20_build.yml
@@ -68,6 +68,12 @@ jobs:
         run: |
           ls -la ./target/${{ inputs.binary-subdir }}
 
+      # We flatten the structure so upload-artifact uploads a flattened structure
+      - name: Prepare binaries for upload
+        run: |
+          mkdir -p ./target/${{ inputs.binary-subdir }}
+          cp ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.so ./target/${{ inputs.binary-subdir }}/ || true
+        
       - name: Upload binary artifacts
         uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
         with:
@@ -79,7 +85,7 @@ jobs:
             ./target/${{ inputs.binary-subdir }}/chainflip-broker-api
             ./target/${{ inputs.binary-subdir }}/chainflip-lp-api
             ./target/${{ inputs.binary-subdir }}/chainflip-ingress-egress-tracker
-            ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.so
+            ./target/${{ inputs.binary-subdir }}/libchainflip_engine_v*.so
             ./target/${{ inputs.binary-subdir }}/engine-runner
 
       - name: Upload runtime artifacts
diff --git a/.github/workflows/_21_build_m2.yml b/.github/workflows/_21_build_m2.yml
index b2ccc53fac..307b81e775 100644
--- a/.github/workflows/_21_build_m2.yml
+++ b/.github/workflows/_21_build_m2.yml
@@ -49,6 +49,12 @@ jobs:
         run: |
           ls -la ./target/${{ inputs.binary-subdir }}
 
+      # We flatten the structure so upload-artifact uploads a flattened structure
+      - name: Prepare binaries for upload
+        run: |
+          mkdir -p ./target/${{ inputs.binary-subdir }}
+          cp ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.so ./target/${{ inputs.binary-subdir }}/ || true
+
       - name: Upload binary artifacts
         uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
         with:
@@ -60,7 +66,7 @@ jobs:
             ./target/${{ inputs.binary-subdir }}/chainflip-broker-api
             ./target/${{ inputs.binary-subdir }}/chainflip-lp-api
             ./target/${{ inputs.binary-subdir }}/chainflip-ingress-egress-tracker
-            ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.dylib
+            ./target/${{ inputs.binary-subdir }}/libchainflip_engine_v*.dylib
             ./target/${{ inputs.binary-subdir }}/engine-runner
 
       - name: Upload runtime artifacts
diff --git a/.github/workflows/_40_post_check.yml b/.github/workflows/_40_post_check.yml
index 8d9439366a..f951c295ae 100644
--- a/.github/workflows/_40_post_check.yml
+++ b/.github/workflows/_40_post_check.yml
@@ -99,7 +99,7 @@ jobs:
           echo "Check for libchainflip_engine_v*.so"
           ls -l /usr/lib/
           # TODO: These shouldn't be required: PRO-1510
-          sudo cp ${{ env.BINARY_ROOT_PATH }}/deps/libchainflip_engine_v*.so /usr/lib/
+          sudo cp ${{ env.BINARY_ROOT_PATH }}/libchainflip_engine_v*.so /usr/lib/
           echo "Check /usr/lib after copy"
           ls -l /usr/lib/
           touch ./localnet/.setup_complete
diff --git a/.github/workflows/_60_upload.yml b/.github/workflows/_60_upload.yml
index 590f326cdc..9f88a6982d 100644
--- a/.github/workflows/_60_upload.yml
+++ b/.github/workflows/_60_upload.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Move .dylib files 📂
         run: |
           mkdir -p assets/m2
-          mv /tmp/assets/m2/deps/libchainflip_engine_v*.dylib assets/m2/
+          mv /tmp/assets/m2/libchainflip_engine_v*.dylib assets/m2/
 
       - name: Download packages 📥
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16