Build universal binary for macOS and change packaging format to `tar.…

…gz` (#2883)
kuzudb · Feb 14, 2024 · 0202e71 · 0202e71
1 parent c0be7f0
commit 0202e71
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 63 deletions.
diff --git a/.github/workflows/linux-precompiled-bin-workflow.yml b/.github/workflows/linux-precompiled-bin-workflow.yml
@@ -23,18 +23,20 @@ jobs:
           mv install/lib/libkuzu.so .
           mv install/bin/kuzu_shell kuzu
 
+      - name: Create tarball
+        run: |
+          tar -czvf libkuzu-linux-old_abi-x86_64.tar.gz kuzu.h kuzu.hpp libkuzu.so
+          tar -czvf kuzu_cli-linux-x86_64.tar.gz kuzu
+
       - uses: actions/upload-artifact@v3
         with:
           name: libkuzu-linux-old_abi-x86_64
-          path: |
-            kuzu.h
-            kuzu.hpp
-            libkuzu.so
+          path: libkuzu-linux-old_abi-x86_64.tar.gz
 
       - uses: actions/upload-artifact@v3
         with:
           name: kuzu_cli-linux-x86_64
-          path: kuzu
+          path: kuzu_cli-linux-x86_64.tar.gz
 
   build-precompiled-bin-x86_64:
     runs-on: kuzu-self-hosted-linux-building-x86_64_centos8
@@ -52,14 +54,15 @@ jobs:
           mv install/include/kuzu.hpp .
           mv install/lib/libkuzu.so .
           mv install/bin/kuzu_shell kuzu
+      
+      - name: Create tarball
+        run: |
+          tar -czvf libkuzu-linux-x86_64.tar.gz kuzu.h kuzu.hpp libkuzu.so
 
       - uses: actions/upload-artifact@v3
         with:
           name: libkuzu-linux-x86_64
-          path: |
-            kuzu.h
-            kuzu.hpp
-            libkuzu.so
+          path: libkuzu-linux-x86_64.tar.gz
 
   build-precompiled-bin-aarch64:
     runs-on: kuzu-self-hosted-linux-building-aarch64
@@ -77,16 +80,18 @@ jobs:
           mv install/include/kuzu.hpp .
           mv install/lib/libkuzu.so .
           mv install/bin/kuzu_shell kuzu
+      
+      - name: Create tarball
+        run: |
+          tar -czvf libkuzu-linux-aarch64.tar.gz kuzu.h kuzu.hpp libkuzu.so
+          tar -czvf kuzu_cli-linux-aarch64.tar.gz kuzu
 
       - uses: actions/upload-artifact@v3
         with:
           name: libkuzu-linux-aarch64
-          path: |
-            kuzu.h
-            kuzu.hpp
-            libkuzu.so
+          path: libkuzu-linux-aarch64.tar.gz
 
       - uses: actions/upload-artifact@v3
         with:
           name: kuzu_cli-linux-aarch64
-          path: kuzu
+          path: kuzu_cli-linux-aarch64.tar.gz
diff --git a/.github/workflows/mac-precompiled-bin-workflow.yml b/.github/workflows/mac-precompiled-bin-workflow.yml
@@ -5,18 +5,18 @@ on:
   workflow_call:
 
 jobs:
-  build-precompiled-bin-arm64:
-    runs-on: macos-14
+  build-precompiled-bin-universal:
+    runs-on: self-hosted-mac-x64
     steps:
       - uses: actions/checkout@v3
 
-      - name: Build precompiled binaries for Apple Silicon
+      - name: Build universal precompiled binaries
         run: |
           make LTO=1 NUM_THREADS=$(sysctl -n hw.ncpu)
           make install
         env:
           MACOSX_DEPLOYMENT_TARGET: 11.0
-          CMAKE_OSX_ARCHITECTURES: "arm64"
+          CMAKE_OSX_ARCHITECTURES: "x86_64;arm64"
 
       - name: Collect artifacts
         run: |
@@ -32,55 +32,17 @@ jobs:
           file -b libkuzu.dylib
           otool -l libkuzu.dylib | grep minos
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: libkuzu-osx-arm64
-          path: |
-            kuzu.h
-            kuzu.hpp
-            libkuzu.dylib
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: kuzu_cli-osx-arm64
-          path: kuzu
-
-  build-precompiled-bin-x86_64:
-    runs-on: self-hosted-mac-x64
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build precompiled binaries for Intel
-        run: |
-          make LTO=1 NUM_THREADS=$(sysctl -n hw.ncpu)
-          make install
-        env:
-          MACOSX_DEPLOYMENT_TARGET: 10.15
-          CMAKE_OSX_ARCHITECTURES: "x86_64"
-
-      - name: Collect artifacts
-        run: |
-          mv install/include/kuzu.h .
-          mv install/include/kuzu.hpp .
-          mv install/lib/libkuzu.dylib .
-          mv install/bin/kuzu_shell kuzu
-
-      - name: Verify binary information
+      - name: Create tarball
         run: |
-          file -b kuzu
-          otool -l kuzu | grep minos
-          file -b libkuzu.dylib
-          otool -l libkuzu.dylib | grep minos
+          tar -czvf libkuzu-osx-universal.tar.gz kuzu.h kuzu.hpp libkuzu.dylib
+          tar -czvf kuzu_cli-osx-universal.tar.gz kuzu
 
       - uses: actions/upload-artifact@v3
         with:
-          name: libkuzu-osx-x86_64
-          path: |
-            kuzu.h
-            kuzu.hpp
-            libkuzu.dylib
+          name: libkuzu-osx-universal
+          path: libkuzu-osx-universal.tar.gz
 
       - uses: actions/upload-artifact@v3
         with:
-          name: kuzu_cli-osx-x86_64
-          path: kuzu
+          name: kuzu_cli-osx-universal
+          path: kuzu_cli-osx-universal.tar.gz