Skip to content

Commit

Permalink
Update to latest datafusion main (#945)
Browse files Browse the repository at this point in the history
Uses latest datafusion main in an attempt to solve
apache/datafusion#13762. The example in
apache/datafusion#13762 is still failing (the
tests added in this branch were switched to using `unwrap_err()` instead
of `unwrap()`).

I'll still merge this PR because there are other breaking changes in the
upcoming release of datafusion, and I'd like to make other PRs here that
use the latest API.
  • Loading branch information
kylebarron authored Dec 13, 2024
1 parent b612869 commit b999078
Show file tree
Hide file tree
Showing 19 changed files with 483 additions and 279 deletions.
49 changes: 25 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,27 +96,28 @@ jobs:
- name: Test
run: cargo check ${{ matrix.args }}

build-benchmarks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
# We use nightly for now so that we can pass RUSTFLAGS below to work around
# https://github.com/geoarrow/geoarrow-rs/issues/716
- uses: dtolnay/rust-toolchain@nightly
- uses: Swatinem/rust-cache@v2
- uses: prefix-dev/[email protected]
with:
activate-environment: true
cache: true
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
manifest-path: build/pixi.toml
- name: Tweak environment to find GDAL
run: |
echo "PKG_CONFIG_PATH=$(pwd)/build/.pixi/envs/default/lib/pkgconfig" >> "$GITHUB_ENV"
echo "LD_LIBRARY_PATH=$(pwd)/build/.pixi/envs/default/lib" >> "$GITHUB_ENV"
- name: Build benchmarks with no features
run: RUSTFLAGS="-Zinline-mir=no" cargo bench --no-run
- name: Build benchmarks with all features
run: RUSTFLAGS="-Zinline-mir=no" cargo bench --no-run --all-features
# We don't build benchmarks on CI because they're quite slow to compile
# build-benchmarks:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# with:
# submodules: "recursive"
# # We use nightly for now so that we can pass RUSTFLAGS below to work around
# # https://github.com/geoarrow/geoarrow-rs/issues/716
# - uses: dtolnay/rust-toolchain@nightly
# - uses: Swatinem/rust-cache@v2
# - uses: prefix-dev/[email protected]
# with:
# activate-environment: true
# cache: true
# cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
# manifest-path: build/pixi.toml
# - name: Tweak environment to find GDAL
# run: |
# echo "PKG_CONFIG_PATH=$(pwd)/build/.pixi/envs/default/lib/pkgconfig" >> "$GITHUB_ENV"
# echo "LD_LIBRARY_PATH=$(pwd)/build/.pixi/envs/default/lib" >> "$GITHUB_ENV"
# - name: Build benchmarks with no features
# run: RUSTFLAGS="-Zinline-mir=no" cargo bench --no-run
# - name: Build benchmarks with all features
# run: RUSTFLAGS="-Zinline-mir=no" cargo bench --no-run --all-features
Loading

0 comments on commit b999078

Please sign in to comment.