Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify some CI checks #699

Merged
merged 2 commits into from
Aug 13, 2024
Merged

Conversation

gadomski
Copy link
Contributor

I ended up touching the wasm and python workflows as well, mostly to make whitespace consistent and to remove the --all flags from the cargo commands (only used for workspaces, and its deprecated).

@gadomski gadomski force-pushed the issues/697-ci-cleanup branch from a1a7b15 to a645a7c Compare August 13, 2024 22:08
@gadomski gadomski force-pushed the issues/697-ci-cleanup branch from a645a7c to ec79ba4 Compare August 13, 2024 22:11
@gadomski gadomski changed the title Simplify some CI checks, test each feature in Rust crate Simplify some CI checks Aug 13, 2024
@gadomski gadomski force-pushed the issues/697-ci-cleanup branch from 13491b7 to cd9603f Compare August 13, 2024 22:17
Comment on lines 30 to 35
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/envs/default/lib/pkgconfig" >> "$GITHUB_ENV"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure but we may still need these environment variables so that the Rust build tooling knows where to find libraries. But maybe activate-environment: true will be sufficient

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yuuup ... we're in good ol' debug-by-push at the moment 🙄 :-)

I'm going to bet most of the stuff is set correctly by the environment, but we might need to suppliment.

@gadomski gadomski force-pushed the issues/697-ci-cleanup branch from cd9603f to 62c6f19 Compare August 13, 2024 22:22
@gadomski gadomski marked this pull request as draft August 13, 2024 22:25
@gadomski gadomski force-pushed the issues/697-ci-cleanup branch 2 times, most recently from 980c334 to 241c717 Compare August 13, 2024 22:34
@gadomski gadomski marked this pull request as ready for review August 13, 2024 22:35
Comment on lines -129 to -131
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"
Copy link
Member

@kylebarron kylebarron Aug 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think you probably need GDAL_HOME and GEOS_LIB_DIR manually set. And probably GEOS_VERSION as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to be passing w/o them? Right now only failure is on the Python .so

@gadomski gadomski force-pushed the issues/697-ci-cleanup branch from 241c717 to abcc4f5 Compare August 13, 2024 22:47
@kylebarron kylebarron merged commit 05b3c9e into geoarrow:main Aug 13, 2024
22 checks passed
@gadomski gadomski deleted the issues/697-ci-cleanup branch August 14, 2024 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor Rust CI a bit
2 participants