Handle updated pixi paths (#495)

geoarrow · Feb 4, 2024 · e51231c · e51231c
1 parent eb94df3
commit e51231c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,12 +26,12 @@ jobs:
         run: |
           curl -fsSL https://pixi.sh/install.sh | bash
           echo "$HOME/.pixi/bin" >> $GITHUB_PATH
-          echo "GDAL_HOME=$(pwd)/build/.pixi/env" >> "$GITHUB_ENV"
-          echo "LD_LIBRARY_PATH=$(pwd)/build/.pixi/env/lib" >> "$GITHUB_ENV"
-          echo "GEOS_LIB_DIR=$(pwd)/build/.pixi/env/lib" >> "$GITHUB_ENV"
+          echo "GDAL_HOME=$(pwd)/build/.pixi/envs/default" >> "$GITHUB_ENV"
+          echo "LD_LIBRARY_PATH=$(pwd)/build/.pixi/envs/default/lib" >> "$GITHUB_ENV"
+          echo "GEOS_LIB_DIR=$(pwd)/build/.pixi/envs/default/lib" >> "$GITHUB_ENV"
           # TODO: infer from toml file/lockfile
           echo "GEOS_VERSION=3.12.1" >> "$GITHUB_ENV"
-          echo "PKG_CONFIG_PATH=$(pwd)/build/.pixi/env/lib/pkgconfig" >> "$GITHUB_ENV"
+          echo "PKG_CONFIG_PATH=$(pwd)/build/.pixi/envs/default/lib/pkgconfig" >> "$GITHUB_ENV"
 
       - name: Install build requirements
         run: |

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # `geoarrow-rs`
 
+touch
+
 A Rust implementation of the [GeoArrow](https://github.com/geoarrow/geoarrow) specification and bindings to [GeoRust algorithms](https://github.com/georust/geo) for efficient spatial operations on GeoArrow memory.
 
 This repository also includes [Python bindings](https://github.com/geoarrow/geoarrow-rs/blob/main/python/core/README.md) and [JavaScript (WebAssembly) bindings](https://github.com/geoarrow/geoarrow-rs/blob/main/js/README.md), wrapping the GeoArrow memory layout and offering vectorized geometry operations.

diff --git a/build/README.md b/build/README.md
@@ -11,9 +11,9 @@ pixi shell
 You can also update your local environment variables by running this from the repo root.
 
 ```bash
-export GDAL_HOME="$(pwd)/build/.pixi/env"
-export LD_LIBRARY_PATH="$(pwd)/build/.pixi/env/lib:$LD_LIBRARY_PATH"
-export GEOS_LIB_DIR="$(pwd)/build/.pixi/env/lib:$GEOS_LIB_DIR"
+export GDAL_HOME="$(pwd)/build/.pixi/envs/default"
+export LD_LIBRARY_PATH="$(pwd)/build/.pixi/envs/default/lib:$LD_LIBRARY_PATH"
+export GEOS_LIB_DIR="$(pwd)/build/.pixi/envs/default/lib:$GEOS_LIB_DIR"
 export GEOS_VERSION=3.12.1
-export PKG_CONFIG_PATH="$(pwd)/build/.pixi/env/lib/pkgconfig:$PKG_CONFIG_PATH"
+export PKG_CONFIG_PATH="$(pwd)/build/.pixi/envs/default/lib/pkgconfig:$PKG_CONFIG_PATH"
 ```