Skip to content

Commit 77ecb97

Browse files
Merge #77
77: test on multiple rust versions r=frewsxcv a=michaelkirk See georust/docker-images#11 for more details and discussion. Co-authored-by: Michael Kirk <[email protected]>
2 parents d788b89 + dff1bab commit 77ecb97

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

.github/workflows/test.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
strategy:
3131
matrix:
32+
container_image: ["georust/proj-ci:rust-1.49", "georust/proj-ci:rust-1.50"]
3233
features:
3334
- ""
3435
- "--features network"
@@ -40,7 +41,7 @@ jobs:
4041
- "--features \"bundled_proj bundled_proj_tiff \""
4142
- "--features \"network bundled_proj geo-types\""
4243
container:
43-
image: georust/proj-ci:proj-7.2.1
44+
image: ${{ matrix.container_image }}
4445
steps:
4546
- name: Checkout repository
4647
uses: actions/checkout@v2
@@ -72,17 +73,32 @@ jobs:
7273
matrix:
7374
include:
7475
- container:
75-
image: georust/proj-ci:proj-7.2.1
76+
image: georust/proj-ci:rust-1.50
7677
env:
7778
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
7879
features: ""
7980
- container:
80-
image: georust/proj-ci:proj-7.2.1
81+
image: georust/proj-ci:rust-1.49
82+
env:
83+
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
84+
features: ""
85+
- container:
86+
image: georust/proj-ci:rust-1.50
87+
env:
88+
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
89+
features: "--features bundled_proj"
90+
- container:
91+
image: georust/proj-ci:rust-1.49
8192
env:
8293
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
8394
features: "--features bundled_proj"
8495
- container:
85-
image: "georust/proj-ci-without-system-proj:latest"
96+
image: georust/proj-ci-without-system-proj:rust-1.50
97+
env:
98+
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
99+
features: ""
100+
- container:
101+
image: georust/proj-ci-without-system-proj:rust-1.49
86102
env:
87103
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
88104
features: ""

0 commit comments

Comments
 (0)