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.

Sign up for GitHub

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

Update libsqlite3-sys to allow 0.31 as well #218

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update libsqlite3-sys to allow 0.31 as well #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03bdaea
Update libsqlite3-sys to allow 0.31 as well
weiznich Jan 20, 2025
12bbc14
Fix the CI
weiznich Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 32 additions & 12 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,27 +69,37 @@ jobs:
strategy:
fail-fast: false
matrix:
container_image:
rust_version:
# Minimum supported rust (MSRV)
- ghcr.io/georust/proj-ci:proj-${{ needs.compute.outputs.LIBPROJ_VERSION }}-rust-${{ needs.compute.outputs.RUST_MSRV }}
- ${{ needs.compute.outputs.RUST_MSRV }}
# Latest stable rust
- ghcr.io/georust/proj-ci:proj-${{ needs.compute.outputs.LIBPROJ_VERSION }}-rust-${{ needs.compute.outputs.RUST_LATEST }}
- ${{ needs.compute.outputs.RUST_LATEST }}
features:
- ""
- "--features network"
- "--features bundled_proj"
- "--no-default-features"
- "--features \"network bundled_proj\""
- "--features \"network geo-types\""
- "--features \"bundled_proj geo-types\""
- "--features \"network bundled_proj geo-types\""
- '--features "network bundled_proj"'
- '--features "network geo-types"'
- '--features "bundled_proj geo-types"'
- '--features "network bundled_proj geo-types"'
container:
image: ${{ matrix.container_image }}
image: ghcr.io/georust/proj-ci:proj-${{ needs.compute.outputs.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
- run: cargo build ${{ matrix.features }}
- run: cargo test ${{ matrix.features }}
- if: matrix.rust_version == env.RUST_LATEST
run: |
cargo build ${{ matrix.features }}
cargo test ${{ matrix.features }}
- uses: taiki-e/install-action@cargo-hack
if: matrix.rust_version == env.RUST_MSRV
- uses: taiki-e/install-action@cargo-minimal-versions
if: matrix.rust_version == env.RUST_MSRV
- if: matrix.rust_version == env.RUST_MSRV
run: |
cargo minimal-versions build ${{ matrix.features }} --direct
cargo minimal-versions test ${{ matrix.features }} --direct

proj-macos:
name: proj macos
Expand Down Expand Up @@ -153,8 +163,18 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
- run: cargo build ${{ matrix.features }}
- run: cargo test ${{ matrix.features }}
- if: matrix.rust_version == env.RUST_LATEST
run: |
cargo build ${{ matrix.features }}
cargo test ${{ matrix.features }}
- uses: taiki-e/install-action@cargo-hack
if: matrix.rust_version == env.RUST_MSRV
- uses: taiki-e/install-action@cargo-minimal-versions
if: matrix.rust_version == env.RUST_MSRV
- if: matrix.rust_version == env.RUST_MSRV
run: |
cargo minimal-versions build ${{ matrix.features }} --direct
cargo minimal-versions test ${{ matrix.features }} --direct

proj-sys-macos:
name: proj-sys macos
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ network = ["ureq", "proj-sys/network"]

[dev-dependencies]
# approx version must match the one used in geo-types
approx = ">= 0.4.0, < 0.6.0"
approx = "0.5"
geo-types = { version = "0.7.10", features = ["approx"] }

[package.metadata.docs.rs]
Expand Down
4 changes: 2 additions & 2 deletions proj-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ links = "proj"
rust-version = "1.70"

[dependencies]
libsqlite3-sys = ">=0.28,<0.31"
link-cplusplus = "1.0"
libsqlite3-sys = ">=0.28,<0.32"
link-cplusplus = "1.0.6"

[build-dependencies]
bindgen = { version = "0.71.1", optional = true }
Expand Down
Loading