FIX: Fix build on aarch64

databento · Mar 29, 2023 · cdff48a · cdff48a
1 parent 1e1c514
commit cdff48a
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -2,19 +2,16 @@ name: build
 
 # Build and test dbn
 
-on:
-  push:
-    branches: [main, dev]
+on: push
 
 jobs:
-  build:
+  x86_64-build:
     strategy:
       fail-fast: false
       matrix:
-        arch: [x64, ARM64]
         os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-    name: build - Python ${{ matrix.python-version }} (${{ matrix.arch }} ${{ matrix.os }})
+    name: build - Python ${{ matrix.python-version }} (x86_64 ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -36,6 +33,61 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.arch }}
+
+      # Install build dependencies
+      - name: Install build dependencies
+        run: python -m pip install --upgrade pip setuptools wheel maturin
+
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: x86_64
+          args: --release --out dist --manifest-path python/Cargo.toml --interpreter python${{ matrix.python-version }}
+
+      - name: Format
+        run: scripts/format.sh
+      - name: Build
+        run: scripts/build.sh
+      - name: Lint
+        run: scripts/lint.sh
+      - name: Test
+        run: scripts/test.sh
+
+  aarch64-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+    name: build - Python ${{ matrix.python-version }} (aarch64 linux)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Cargo setup
+      - name: Set up Cargo cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
+
+      # Python setup
+      - name: Set up Python environment
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: aarch64
+          manylinux: auto
+          args: --release --out dist --manifest-path python/Cargo.toml --interpreter python${{ matrix.python-version }}
 
       # Install build dependencies
       - name: Install build dependencies

diff --git a/rust/dbn/src/record.rs b/rust/dbn/src/record.rs
@@ -719,7 +719,7 @@ impl ErrorMsg {
     /// This function returns an error if `err` contains invalid UTF-8.
     pub fn err(&self) -> Result<&str, Utf8Error> {
         // Safety: a pointer to `self.err` will always be valid
-        unsafe { CStr::from_ptr(&self.err as *const i8).to_str() }
+        unsafe { CStr::from_ptr(&self.err as *const c_char).to_str() }
     }
 }