added binary for release for both mac archs

Author: hadikhamoud

.github/workflows/ci.yml

@@ -55,10 +55,8 @@ jobs:
         include:
           - os: ubuntu-latest
             artifact_name: onion-linux-x86_64
-          - os: macos-13
-            artifact_name: onion-darwin-x86_64
           - os: macos-14
-            artifact_name: onion-darwin-arm64
+            artifact_name: onion-darwin-universal
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/release.yml

@@ -17,10 +17,8 @@ jobs:
         include:
           - os: ubuntu-latest
             artifact_name: onion-linux-x86_64
-          - os: macos-13
-            artifact_name: onion-darwin-x86_64
           - os: macos-14
-            artifact_name: onion-darwin-arm64
+            artifact_name: onion-darwin-universal
 
     steps:
     - uses: actions/checkout@v4
@@ -67,16 +65,10 @@ jobs:
         name: onion-linux-x86_64
         path: dalla_data_processing/deduplication/bin/
 
-    - name: Download macOS Intel binary
+    - name: Download macOS universal binary
       uses: actions/download-artifact@v4
       with:
-        name: onion-darwin-x86_64
-        path: dalla_data_processing/deduplication/bin/
-    
-    - name: Download macOS ARM binary
-      uses: actions/download-artifact@v4
-      with:
-        name: onion-darwin-arm64
+        name: onion-darwin-universal
         path: dalla_data_processing/deduplication/bin/
 
     - name: Set binary permissions

scripts/build_onion.sh

@@ -59,6 +59,7 @@ make clean 2>/dev/null || true
 
 # Set up compiler flags for macOS
 EXTRA_CFLAGS=""
+EXTRA_LDFLAGS=""
 if [[ "$OSTYPE" == "darwin"* ]]; then
     # On macOS, add Homebrew paths for sparsehash
     if command -v brew &> /dev/null; then
@@ -68,11 +69,16 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
         echo -e "${YELLOW}Using Homebrew prefix: ${BREW_PREFIX}${NC}"
         echo -e "${YELLOW}Using sparsehash include: ${SPARSEHASH_PREFIX}/include${NC}"
     fi
+    
+    # Build universal binary for macOS (x86_64 + arm64)
+    EXTRA_CFLAGS="${EXTRA_CFLAGS} -arch x86_64 -arch arm64"
+    EXTRA_LDFLAGS="-arch x86_64 -arch arm64"
+    echo -e "${YELLOW}Building universal binary (x86_64 + arm64)${NC}"
 fi
 
 # Build onion
 echo -e "${YELLOW}Compiling Onion...${NC}"
-if make CFLAGS="-Wall -O3 -std=c++11 ${EXTRA_CFLAGS}"; then
+if make CFLAGS="-Wall -O3 -std=c++11 ${EXTRA_CFLAGS}" LDFLAGS="${EXTRA_LDFLAGS}"; then
     echo -e "${GREEN}✓ Compilation successful${NC}"
 else
     echo -e "${RED}✗ Compilation failed${NC}"
@@ -88,6 +94,12 @@ fi
 # Get platform info
 PLATFORM=$(uname -s | tr '[:upper:]' '[:lower:]')
 ARCH=$(uname -m)
+
+# On macOS, use "universal" as arch since we build a fat binary
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    ARCH="universal"
+fi
+
 echo -e "${YELLOW}Platform: $PLATFORM-$ARCH${NC}"
 
 # Create output directory
@@ -104,6 +116,12 @@ ln -sf "onion-$PLATFORM-$ARCH" "$OUTPUT_DIR/onion"
 echo -e "${GREEN}=== Build Complete ===${NC}"
 echo -e "${GREEN}Binary location: $OUTPUT_DIR/onion-$PLATFORM-$ARCH${NC}"
 
+# On macOS, verify it's a universal binary
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    echo -e "${YELLOW}Verifying universal binary architectures:${NC}"
+    lipo -info "$OUTPUT_DIR/onion-$PLATFORM-$ARCH"
+fi
+
 # Verify binary works
 if "$OUTPUT_DIR/onion-$PLATFORM-$ARCH" -h &> /dev/null; then
     echo -e "${GREEN}✓ Binary is executable and working${NC}"