Skip to content

Commit 952c4d0

Browse files
authored
Update libsqlite3-sys to allow 0.31 as well (#218)
- [x] I agree to follow the project's [code of conduct](https://github.com/georust/.github/blob/main/CODE_OF_CONDUCT.md). - [x] I added an entry to the project's change log file if knowledge of this change could be valuable to users. - Usually called `CHANGES.md` or `CHANGELOG.md` - Prefix changelog entries for breaking changes with "BREAKING: " ---
1 parent 14d71bb commit 952c4d0

File tree

3 files changed

+35
-15
lines changed

3 files changed

+35
-15
lines changed

.github/workflows/test.yml

+32-12
Original file line numberDiff line numberDiff line change
@@ -69,27 +69,37 @@ jobs:
6969
strategy:
7070
fail-fast: false
7171
matrix:
72-
container_image:
72+
rust_version:
7373
# Minimum supported rust (MSRV)
74-
- ghcr.io/georust/proj-ci:proj-${{ needs.compute.outputs.LIBPROJ_VERSION }}-rust-${{ needs.compute.outputs.RUST_MSRV }}
74+
- ${{ needs.compute.outputs.RUST_MSRV }}
7575
# Latest stable rust
76-
- ghcr.io/georust/proj-ci:proj-${{ needs.compute.outputs.LIBPROJ_VERSION }}-rust-${{ needs.compute.outputs.RUST_LATEST }}
76+
- ${{ needs.compute.outputs.RUST_LATEST }}
7777
features:
7878
- ""
7979
- "--features network"
8080
- "--features bundled_proj"
8181
- "--no-default-features"
82-
- "--features \"network bundled_proj\""
83-
- "--features \"network geo-types\""
84-
- "--features \"bundled_proj geo-types\""
85-
- "--features \"network bundled_proj geo-types\""
82+
- '--features "network bundled_proj"'
83+
- '--features "network geo-types"'
84+
- '--features "bundled_proj geo-types"'
85+
- '--features "network bundled_proj geo-types"'
8686
container:
87-
image: ${{ matrix.container_image }}
87+
image: ghcr.io/georust/proj-ci:proj-${{ needs.compute.outputs.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
8888
steps:
8989
- name: Checkout repository
9090
uses: actions/checkout@v4
91-
- run: cargo build ${{ matrix.features }}
92-
- run: cargo test ${{ matrix.features }}
91+
- if: matrix.rust_version == env.RUST_LATEST
92+
run: |
93+
cargo build ${{ matrix.features }}
94+
cargo test ${{ matrix.features }}
95+
- uses: taiki-e/install-action@cargo-hack
96+
if: matrix.rust_version == env.RUST_MSRV
97+
- uses: taiki-e/install-action@cargo-minimal-versions
98+
if: matrix.rust_version == env.RUST_MSRV
99+
- if: matrix.rust_version == env.RUST_MSRV
100+
run: |
101+
cargo minimal-versions build ${{ matrix.features }} --direct
102+
cargo minimal-versions test ${{ matrix.features }} --direct
93103
94104
proj-macos:
95105
name: proj macos
@@ -153,8 +163,18 @@ jobs:
153163
steps:
154164
- name: Checkout repository
155165
uses: actions/checkout@v4
156-
- run: cargo build ${{ matrix.features }}
157-
- run: cargo test ${{ matrix.features }}
166+
- if: matrix.rust_version == env.RUST_LATEST
167+
run: |
168+
cargo build ${{ matrix.features }}
169+
cargo test ${{ matrix.features }}
170+
- uses: taiki-e/install-action@cargo-hack
171+
if: matrix.rust_version == env.RUST_MSRV
172+
- uses: taiki-e/install-action@cargo-minimal-versions
173+
if: matrix.rust_version == env.RUST_MSRV
174+
- if: matrix.rust_version == env.RUST_MSRV
175+
run: |
176+
cargo minimal-versions build ${{ matrix.features }} --direct
177+
cargo minimal-versions test ${{ matrix.features }} --direct
158178
159179
proj-sys-macos:
160180
name: proj-sys macos

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ network = ["ureq", "proj-sys/network"]
3333

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

3939
[package.metadata.docs.rs]

proj-sys/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ links = "proj"
1212
rust-version = "1.70"
1313

1414
[dependencies]
15-
libsqlite3-sys = ">=0.28,<0.31"
16-
link-cplusplus = "1.0"
15+
libsqlite3-sys = ">=0.28,<0.32"
16+
link-cplusplus = "1.0.6"
1717

1818
[build-dependencies]
1919
bindgen = { version = "0.71.1", optional = true }

0 commit comments

Comments
 (0)