Merge development into main (v3.5.0-ICCery.1.4)

Merge pull request 'Merge development into main (v3.5.0-ICCery.1.4)' (#31) from development into main
Fix: Handle non-Mach-O files during macOS universal binary lipo assembly
2026-09-01 00:16:56 +01:00 · 2026-09-01 00:16:49 +01:00 · 2026-09-01 00:16:11 +01:00
1 changed files with 15 additions and 3 deletions
@@ -112,14 +112,26 @@ jobs:
          for file in raw-bin-arm64/*; do
            bin_name=$(basename "$file")
            if [ -f "raw-bin-x86_64/$bin_name" ]; then
-              echo "Creating universal binary with lipo: $bin_name"
-              lipo -create "raw-bin-x86_64/$bin_name" "raw-bin-arm64/$bin_name" -output "bin/$bin_name"
-              chmod +x "bin/$bin_name"
+              if file "raw-bin-arm64/$bin_name" | grep -q "Mach-O" && file "raw-bin-x86_64/$bin_name" | grep -q "Mach-O"; then
+                echo "Creating universal binary with lipo: $bin_name"
+                lipo -create "raw-bin-x86_64/$bin_name" "raw-bin-arm64/$bin_name" -output "bin/$bin_name"
+                chmod +x "bin/$bin_name"
+              else
+                echo "Non Mach-O file, copying directly: $bin_name"
+                cp "$file" "bin/$bin_name"
+              fi
            else
              echo "Warning: $bin_name not found in raw-bin-x86_64, copying arm64 version"
              cp "$file" "bin/$bin_name"
            fi
          done
+          for file in raw-bin-x86_64/*; do
+            bin_name=$(basename "$file")
+            if [ ! -f "bin/$bin_name" ]; then
+              echo "Warning: $bin_name only found in raw-bin-x86_64, copying x86_64 version"
+              cp "$file" "bin/$bin_name"
+            fi
+          done

      - name: Verify Architecture & Smoke Tests
        env:
Author	SHA1	Message	Date
gronod	e0f86eec29	Merge development into main (v3.5.0-ICCery.1.4) Linux x86_64 Release Build / build (push) Successful in 9m37s Details Windows x86_64 Release Build / build (push) Successful in 9m38s Details Merge pull request 'Merge development into main (v3.5.0-ICCery.1.4)' (#31) from development into main	2026-09-01 00:16:56 +01:00
gronod	c196912bed	Fix: Handle non-Mach-O files during macOS universal binary lipo assembly Merge pull request 'Fix: Handle non-Mach-O files during macOS universal binary lipo assembly' (#30) from fix/macos-universal-non-macho-lipo into development	2026-09-01 00:16:49 +01:00
gronod	ebbc675297	fix(ci): handle non-Mach-O files like metainfo.xml during universal lipo assembly	2026-09-01 00:16:11 +01:00