update ci containers

georust · Mar 9, 2022 · bed17eb · bed17eb
1 parent 21b0247
commit bed17eb
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,14 +30,19 @@ jobs:
       - name: Mark the job as a failure
         if: "!success()"
         run: exit 1
+
   proj-ubuntu:
     name: proj ubuntu
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        container_image: ["georust/proj-ci:rust-1.52", "georust/proj-ci:rust-1.53"]
+        container_image:
+          # Minimum supported rust (MSRV)
+          - "georust/proj-ci:rust-1.52"
+          # Latest stable rust
+          - "georust/proj-ci:rust-1.59"
         features:
           - ""
           - "--features network"
@@ -80,33 +85,36 @@ jobs:
     strategy:
       matrix:
         include:
-          - container:
-              image: georust/proj-ci:rust-1.53
-              env:
-                _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
-            features: ""
+          # Minimum supported rust (MSRV)
           - container:
               image: georust/proj-ci:rust-1.52
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
             features: ""
           - container:
-              image: georust/proj-ci:rust-1.53
+              image: georust/proj-ci:rust-1.52
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
             features: "--features bundled_proj"
           - container:
-              image: georust/proj-ci:rust-1.52
+              image: georust/proj-ci-without-system-proj:rust-1.52
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
-            features: "--features bundled_proj"
+            features: ""
+
+          # Latest stable rust
           - container:
-              image: georust/proj-ci-without-system-proj:rust-1.53
+              image: georust/proj-ci:rust-1.59
               env:
-                _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
+                _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
             features: ""
           - container:
-              image: georust/proj-ci-without-system-proj:rust-1.52
+              image: georust/proj-ci:rust-1.59
+              env:
+                _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
+            features: "--features bundled_proj"
+          - container:
+              image: georust/proj-ci-without-system-proj:rust-1.59
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
             features: ""