chore: bump libzedmd, cleanup ci

vpinball · Apr 3, 2024 · 7697646 · 7697646
1 parent 3387401
commit 7697646
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/libdmdutil.yml b/.github/workflows/libdmdutil.yml
@@ -180,7 +180,9 @@ jobs:
         run: |
           mkdir tmp
           find "libdmdutil-${{ needs.version.outputs.tag }}-macos-arm64" -name "*.dylib" | while read -r file; do
-            if [ ! -L "$file" ]; then
+            if [ -L "$file" ]; then
+              cp -a "$file" "tmp/"
+            elif [ -f "$file" ]; then
               filename=$(basename "$file")
               lipo -create -output "tmp/$filename" \
                 "libdmdutil-${{ needs.version.outputs.tag }}-macos-arm64/$filename" \

diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405

diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405

diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
@@ -66,10 +66,8 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
-cp third-party/include/FrameUtil.h ../../third-party/include/
-ln -s $(ls -v third-party/runtime-libs/linux/aarch64/libserialport.so.* | tail -n 1 | xargs basename) third-party/runtime-libs/linux/aarch64/libserialport.so
-cp -a third-party/runtime-libs/linux/aarch64/libserialport.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
-cp -a build/libzedmd.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
+cp -a third-party/runtime-libs/linux/aarch64/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
+cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
 cp -r test ../../
 cd ..
 

diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
@@ -66,10 +66,8 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
-cp third-party/include/FrameUtil.h ../../third-party/include/
-ln -s $(ls -v third-party/runtime-libs/linux/x64/libserialport.so.* | tail -n 1 | xargs basename) third-party/runtime-libs/linux/x64/libserialport.so
-cp -a third-party/runtime-libs/linux/x64/libserialport.{so,so.*} ../../third-party/runtime-libs/linux/x64/
-cp -a build/libzedmd.{so,so.*} ../../third-party/runtime-libs/linux/x64/
+cp -a third-party/runtime-libs/linux/x64/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
+cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
 cp -r test ../../
 cd ..
 

diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405

diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405

diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405

diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405

diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
+LIBZEDMD_SHA=cc62fff0765cddee4703e471d990e9bae3c0f94d
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405