gronod/argyllcms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

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

Merged
gronod merged 2 commits from development into main 2026-09-01 00:16:58 +01:00
Conversation 0 Commits 2 Files Changed 1
+15 -3
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-macos.yml
+12
View File
@@ -112,14 +112,26 @@ jobs:
for file in raw-bin-arm64/*; do for file in raw-bin-arm64/*; do
bin_name=$(basename "$file") bin_name=$(basename "$file")
if [ -f "raw-bin-x86_64/$bin_name" ]; then if [ -f "raw-bin-x86_64/$bin_name" ]; then
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" 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" lipo -create "raw-bin-x86_64/$bin_name" "raw-bin-arm64/$bin_name" -output "bin/$bin_name"
chmod +x "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 else
echo "Warning: $bin_name not found in raw-bin-x86_64, copying arm64 version" echo "Warning: $bin_name not found in raw-bin-x86_64, copying arm64 version"
cp "$file" "bin/$bin_name" cp "$file" "bin/$bin_name"
fi fi
done 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 - name: Verify Architecture & Smoke Tests
env: env: