CI tests

georust · Jan 24, 2025 · 91abca6 · 91abca6
1 parent 03bdaea
commit 91abca6
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -69,27 +69,36 @@ 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 }}
+        if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_LATEST }}
       - run: cargo test ${{ matrix.features }}
+        if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_LATEST }}
+      - uses: taiki-e/install-action@cargo-hack
+        if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_MSRV }}
+      - uses: taiki-e/install-action@cargo-minimal-versions
+        if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_MSRV }}
+      - run: cargo +${{ matrix.rust_version }} minimal-versions build ${{ matrix.features }}
+        if: ${{ matrix.rust_version }} == ${{ needs.compute.outputs.RUST_MSRV }}
+      - run: cargo +${{ matrix.rust_version }} minimal-versions test ${{ matrix.features }}
 
   proj-macos:
     name: proj macos