Skip to content

Commit b32802e

Browse files
authored
chore: Fix macos pyvortex packaging (#2036)
the wheel build for aarch64 [fails](https://github.com/spiraldb/vortex/actions/runs/12887066521/job/35930052936) on the macos (x86) based CI runner. Seems like `target-cpu=native` doesn't work well with cross compilation/maturin/ring.
1 parent 5486c92 commit b32802e

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

.cargo/config.toml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
# For pyo3 to successfully link on Macos
22
# See https://stackoverflow.com/a/77382609
33
[target.aarch64-apple-darwin]
4-
rustflags = [
5-
"-C", "link-arg=-undefined",
6-
"-C", "link-arg=dynamic_lookup",
7-
"-C", "target-cpu=native",
8-
]
4+
rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]
95
[target.x86_64-apple-darwin]
10-
rustflags = [
11-
"-C", "link-arg=-undefined",
12-
"-C", "link-arg=dynamic_lookup",
13-
"-C", "target-cpu=native",
14-
]
6+
rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]
157

168
[alias]
179
xtask = "run -p xtask --"

.github/workflows/bench-pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ jobs:
106106
- uses: actions/checkout@v4
107107
- uses: ./.github/actions/cleanup
108108
- uses: ./.github/actions/setup-rust
109-
110109
# The compression benchmarks rely on DuckDB being installed to convert CSV to Parquet
111110
- name: Install DuckDB
112111
uses: opt-nc/setup-duckdb-action@v1.0.10

.github/workflows/release-plz.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ jobs:
6464
steps:
6565
- uses: actions/checkout@v4
6666
- uses: ./.github/actions/cleanup
67-
- uses: ./.github/actions/setup-rust
68-
- uses: spiraldb/actions/.github/actions/setup-uv@0.2.0
6967
- name: rust-toolchain
7068
shell: bash
7169
run: echo "version=$(cat rust-toolchain.toml | grep channel | awk -F'\"' '{print $2}')" >> $GITHUB_OUTPUT
@@ -83,6 +81,7 @@ jobs:
8381
working-directory: pyvortex
8482
target: aarch64 # NB: aarch64 becomes arm64 in the wheel's platform tag.
8583
args: --release --interpreter python3.10
84+
- uses: spiraldb/actions/.github/actions/setup-uv@0.2.0
8685
- name: test wheel
8786
run: |
8887
set -ex
@@ -107,10 +106,6 @@ jobs:
107106
runs-on: ubuntu-latest
108107
steps:
109108
- uses: actions/checkout@v4
110-
# maturin-action builds in an isolated container; setting RUSTC_WRAPPER=sccache triggers failure
111-
# because sccache is not installed in the container.
112-
#
113-
# - uses: ./.github/actions/setup-rust
114109
- uses: spiraldb/actions/.github/actions/setup-uv@0.2.0
115110
- name: rust-toolchain
116111
shell: bash

0 commit comments

Comments
 (0)