Skip to content

Commit

Permalink
Merge #77
Browse files Browse the repository at this point in the history
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 <michael.code@endoftheworl.de>
  • Loading branch information
bors[bot] and michaelkirk authored Feb 22, 2021
2 parents d788b89 + dff1bab commit 77ecb97
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
container_image: ["georust/proj-ci:rust-1.49", "georust/proj-ci:rust-1.50"]
features:
- ""
- "--features network"
Expand All @@ -40,7 +41,7 @@ jobs:
- "--features \"bundled_proj bundled_proj_tiff \""
- "--features \"network bundled_proj geo-types\""
container:
image: georust/proj-ci:proj-7.2.1
image: ${{ matrix.container_image }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down Expand Up @@ -72,17 +73,32 @@ jobs:
matrix:
include:
- container:
image: georust/proj-ci:proj-7.2.1
image: georust/proj-ci:rust-1.50
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
features: ""
- container:
image: georust/proj-ci:proj-7.2.1
image: georust/proj-ci:rust-1.49
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
features: ""
- container:
image: georust/proj-ci:rust-1.50
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: "--features bundled_proj"
- container:
image: georust/proj-ci:rust-1.49
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: "--features bundled_proj"
- container:
image: "georust/proj-ci-without-system-proj:latest"
image: georust/proj-ci-without-system-proj:rust-1.50
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: ""
- container:
image: georust/proj-ci-without-system-proj:rust-1.49
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: ""
Expand Down

0 comments on commit 77ecb97

Please sign in to comment.