From ef17eb45f7f1c564dc5c0280e39fe30b03661f7a Mon Sep 17 00:00:00 2001
From: Chantepierre <lucas@lucassifoni.info>
Date: Thu, 27 Aug 2026 20:40:34 +0200
Subject: [PATCH 1/2] Removes differing signature files before codesign

---
 .github/workflows/build-macos.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 11b07d57..0bb2d79b 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -106,6 +106,8 @@ jobs:
           ARM="$PWD/arm64/DFTFringe.app"
           INTEL="$PWD/x86_64/DFTFringe.app"
 
+          rm -rf "$ARM/Contents/_CodeSignature" "$INTEL/Contents/_CodeSignature"
+
           diff <(cd "$ARM" && find . | sort) <(cd "$INTEL" && find . | sort) \
             || { echo "the two bundles do not contain the same files"; exit 1; }
 

From 7bb2cab306bd0b2246b28c8eec071341315cbaff Mon Sep 17 00:00:00 2001
From: Chantepierre <lucas@lucassifoni.info>
Date: Thu, 27 Aug 2026 21:40:03 +0200
Subject: [PATCH 2/2] Removes diffing of package contents which will exit 1 due
 to ffmpeg libraries versions

---
 .github/workflows/build-macos.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 0bb2d79b..92738c78 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -108,19 +108,22 @@ jobs:
 
           rm -rf "$ARM/Contents/_CodeSignature" "$INTEL/Contents/_CodeSignature"
 
-          diff <(cd "$ARM" && find . | sort) <(cd "$INTEL" && find . | sort) \
-            || { echo "the two bundles do not contain the same files"; exit 1; }
-
           cp -R "$ARM" DFTFringe.app
-          UNIVERSAL="$PWD/DFTFringe.app"
-          find "$UNIVERSAL" -type f | while read -r f; do
-            rel="${f#$UNIVERSAL/}"
-            if file -b "$f" | grep -q "Mach-O"; then
+          cp -Rn "$INTEL/" DFTFringe.app/ || true
+
+          find DFTFringe.app -type f | while read -r f; do
+            rel="${f#DFTFringe.app/}"
+            if [ -f "$ARM/$rel" ] && [ -f "$INTEL/$rel" ] && file -b "$f" | grep -q "Mach-O"; then
               lipo -create "$ARM/$rel" "$INTEL/$rel" -output "$f"
             fi
           done
-          echo "--- architectures in the merged executable:"
-          lipo -info "$UNIVERSAL/Contents/MacOS/DFTFringe"
+
+          ARCHS="$(lipo -archs DFTFringe.app/Contents/MacOS/DFTFringe)"
+          echo "--- architectures in the merged executable: $ARCHS"
+          case "$ARCHS" in
+            *arm64*x86_64*|*x86_64*arm64*) ;;
+            *) echo "the merged executable is not universal"; exit 1 ;;
+          esac
 
       - name: Ad-hoc sign
         run: |