Skip to content

Commit

Permalink
Merge #124
Browse files Browse the repository at this point in the history
124: Fix CI r=michaelkirk a=michaelkirk



Co-authored-by: Michael Kirk <[email protected]>
  • Loading branch information
bors[bot] and michaelkirk authored Apr 18, 2022
2 parents 2c2453b + a1d020c commit 41e4fd1
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
matrix:
container_image:
# Minimum supported rust (MSRV)
- "georust/proj-ci:proj-9.0.0-rust-1.52"
- "georust/proj-ci:proj-9.0.0-rust-1.56"
# Latest stable rust
- "georust/proj-ci:proj-9.0.0-rust-1.59"
features:
Expand Down Expand Up @@ -87,17 +87,17 @@ jobs:
include:
# Minimum supported rust (MSRV)
- container:
image: georust/proj-ci:proj-9.0.0-rust-1.52
image: georust/proj-ci:proj-9.0.0-rust-1.56
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
features: ""
- container:
image: georust/proj-ci:proj-9.0.0-rust-1.52
image: georust/proj-ci:proj-9.0.0-rust-1.56
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: "--features bundled_proj"
- container:
image: georust/proj-ci-without-system-proj:proj-9.0.0-rust-1.52
image: georust/proj-ci-without-system-proj:proj-9.0.0-rust-1.56
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: ""
Expand Down Expand Up @@ -130,8 +130,11 @@ jobs:
runs-on: macos-latest
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
defaults:
run:
working-directory: proj-sys
steps:
- name: Checkout repository
uses: actions/checkout@v2
- run: brew install proj
- run: cargo test ${{ matrix.features }}
- run: cargo test

0 comments on commit 41e4fd1

Please sign in to comment.