diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bcac2ea..fb2ddf1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,6 +15,7 @@ jobs: name: Test runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: - ubuntu-latest @@ -25,6 +26,20 @@ jobs: - uses: actions/checkout@v4 - uses: astral-sh/setup-uv@v3 - uses: Swatinem/rust-cache@v2 + - name: Download libduckdb (macos) + if: matrix.os == 'macos-latest' + run: | + wget https://github.com/duckdb/duckdb/releases/download/v1.1.3/libduckdb-osx-universal.zip + unzip libduckdb-osx-universal.zip -d libduckdb + echo "DYLD_LIBRARY_PATH=libduckdb" >> $GITHUB_ENV + echo "LIBRARY_PATH=libduckdb" >> $GITHUB_ENV + - name: Download libduckdb (ubuntu) + if: matrix.os == 'ubuntu-latest' + run: | + wget https://github.com/duckdb/duckdb/releases/download/v1.1.3/libduckdb-linux-amd64.zip + unzip libduckdb-linux-amd64.zip -d libduckdb + echo "LD_LIBRARY_PATH=libduckdb" >> $GITHUB_ENV + echo "LIBRARY_PATH=libduckdb" >> $GITHUB_ENV - name: Sync run: uv sync - name: Lint diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index fcfe048..cdccfa2 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -46,7 +46,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter + args: --release --out dist --find-interpreter -F duckdb/bundled sccache: "true" manylinux: ${{ matrix.platform.manylinux }} - name: Upload wheels @@ -77,7 +77,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter + args: --release --out dist --find-interpreter -F duckdb/bundled sccache: "true" manylinux: musllinux_1_2 - name: Upload wheels @@ -132,7 +132,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter + args: --release --out dist --find-interpreter -F duckdb/bundled sccache: "true" - name: Upload wheels uses: actions/upload-artifact@v4 diff --git a/Cargo.lock b/Cargo.lock index 5e8fac8..875a54f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1819,7 +1819,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac2de5219db852597558df5dcd617ffccd5cbd7b9f5402ccbf899aca6cb6047" dependencies = [ "autocfg", - "cc", "flate2", "pkg-config", "serde", diff --git a/Cargo.toml b/Cargo.toml index 60276e3..ab2e901 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ name = "stacrs" crate-type = ["cdylib"] [dependencies] -duckdb = { version = "1.1.1", features = ["bundled"] } +duckdb = { version = "1.1.1" } geojson = "0.24.1" pyo3 = "0.23.4" pyo3-async-runtimes = { version = "0.23.0", features = [