Merge pull request #9 from thomaskf/master

Fix the issue in the workflow for Mac Universal

Author: bqminh

.github/workflows/ci.yaml

@@ -170,22 +170,33 @@ jobs:
       - build-macos-arm
 
     steps:
-      - name: Download Artifacts
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download Mac x86-64 Artifact
         uses: actions/download-artifact@v4
         with:
-          pattern: Mac *
-
+          name: Mac x86-64
+          path: x86
+        
+      - name: Download Mac Arm Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: Mac Arm
+          path: arm
+    
       - name: Combine Artifacts
-        run: lipo -create -output iqtree3 "Mac x86-64/iqtree3" "Mac Arm/iqtree3"
-
-      - name: Check Architectures
-        run: lipo -archs iqtree3
-
+        run: |
+          chmod +x test_scripts/make_universal.sh 
+          file1=$(ls x86/iqtree*.zip)
+          file2=$(ls arm/iqtree*.zip)
+          test_scripts/make_universal.sh "$file1" "$file2"
+          
       - name: Upload Built Binary
         uses: actions/upload-artifact@v4
         with:
           name: Mac Universal
-          path: iqtree3
+          path: iqtree*.zip
           if-no-files-found: error
 
   build-windows-x86-64:
@@ -228,7 +239,7 @@ jobs:
             -DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}/include ^
             -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib ^
             -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ^
-            -DIQTREE_FLAGS="cpp14" ..
+            -DIQTREE_FLAGS="static cpp14" ..
           make -j
           make package
         env: