Skip to content

Commit 91abca6

Browse files
committed
CI tests
1 parent 03bdaea commit 91abca6

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

.github/workflows/test.yml

+17-8
Original file line numberDiff line numberDiff line change
@@ -69,27 +69,36 @@ 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
9191
- run: cargo build ${{ matrix.features }}
92+
if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_LATEST }}
9293
- run: cargo test ${{ matrix.features }}
94+
if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_LATEST }}
95+
- uses: taiki-e/install-action@cargo-hack
96+
if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_MSRV }}
97+
- uses: taiki-e/install-action@cargo-minimal-versions
98+
if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_MSRV }}
99+
- run: cargo +${{ matrix.rust_version }} minimal-versions build ${{ matrix.features }}
100+
if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_MSRV }}
101+
- run: cargo +${{ matrix.rust_version }} minimal-versions test ${{ matrix.features }}
93102

94103
proj-macos:
95104
name: proj macos

0 commit comments

Comments
 (0)