From 5b5d2d03d225c18fa97d5a9f0ebe2653f29b69f5 Mon Sep 17 00:00:00 2001
From: apbassett <43486400+apbassett@users.noreply.github.com>
Date: Tue, 14 Nov 2023 12:06:48 -0500
Subject: [PATCH] Adds workflow metadata to all plat versions

---
 .github/workflows/build.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index de58829..e649dce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -115,25 +115,23 @@ jobs:
         # Needed because release/non-release downloads are different structure
         cd amalgam/lib/windows/amd64 && if [ ! -f *.tar.gz ]; then mv */*.tar.gz ./; fi && tar -xvzf *.tar.gz
 
-    - name: Clean up dir (plat-specific)
-      if: matrix.plat != 'any'
+    - name: Format lib dir and add workflow metadata
       run: |
         cp version.json amalgam/lib/version.json
         cd amalgam/lib
-        sed -i 's/dependencies/version/g' version.json
-        find . -type d -name lib -exec sh -c 'mv {}/* "$(dirname {})"' \;
-
-    - name: Clean up dir (all plats)
-      if: matrix.plat == 'any'
-      run: |
-        cp version.json amalgam/lib/version.json
-        cd amalgam/lib
-        cp linux/amd64/bin/amalgam-mt ~/amalgam-mt
+        if [[ "${{ matrix.plat }}" == 'win_amd64' ]]; then
+          fp=$(find ./ -type f -name 'amalgam-mt.exe')
+        elif [[ "${{ matrix.plat }}" == 'any' ]]; then
+          fp="./linux/amd64/bin/amalgam-mt"
+        else
+          fp=$(find ./ -type f -name 'amalgam-mt')
+        fi
+        echo "Found amalgam-mt at: $fp"
+        cp $fp ~/amalgam-mt
         sed -i 's/dependencies/version/g' version.json
         find . -type d -name lib -exec sh -c 'mv {}/* "$(dirname {})"' \;
 
     - name: Set amalgam version metadata
-      if: matrix.plat == 'any'
       run: |
         cd amalgam/lib
         # Set the display title and build date info in version.json