Skip to content

Commit

Permalink
Merge #1033
Browse files Browse the repository at this point in the history
1033: update CI containers to use libproj 9.2.1 r=michaelkirk a=urschrei

- [x] I agree to follow the project's [code of conduct](https://github.com/georust/geo/blob/main/CODE_OF_CONDUCT.md).
- [x] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users.
---


Co-authored-by: Michael Kirk <michael.code@endoftheworl.de>
  • Loading branch information
bors[bot] and michaelkirk committed Jul 10, 2023
2 parents 3a9ce41 + c4ce446 commit 22e6956
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ jobs:
matrix:
container_image:
# Use the latest stable version. No need for older versions.
- "georust/geo-ci:proj-9.1.0-rust-1.70"
- "georust/geo-ci:proj-9.2.1-rust-1.70"
container:
image: ${{ matrix.container_image }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- run: rustup component add rustfmt clippy
- run: cargo fmt --all -- --check
- run: cargo clippy --all-features --all-targets -- -Dwarnings
Expand All @@ -67,15 +67,15 @@ jobs:
# giving us about 6 months of coverage.
#
# Minimum supported rust version (MSRV)
- "georust/geo-ci:rust-1.63"
- "georust/geo-ci:proj-9.2.1-rust-1.63"
# Two most recent releases - we omit older ones for expedient CI
- "georust/geo-ci:proj-9.1.0-rust-1.69"
- "georust/geo-ci:proj-9.1.0-rust-1.70"
- "georust/geo-ci:proj-9.2.1-rust-1.69"
- "georust/geo-ci:proj-9.2.1-rust-1.70"
container:
image: ${{ matrix.container_image }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- run: rustup target add thumbv7em-none-eabihf
- run: cargo check --all-targets --no-default-features
- run: cargo check --lib --target thumbv7em-none-eabihf --no-default-features -F use-rstar_0_9,serde
Expand All @@ -95,15 +95,15 @@ jobs:
# giving us about 6 months of coverage.
#
# Minimum supported rust version (MSRV)
- "georust/geo-ci:rust-1.63"
- "georust/geo-ci:proj-9.2.1-rust-1.63"
# Two most recent releases - we omit older ones for expedient CI
- "georust/geo-ci:proj-9.1.0-rust-1.69"
- "georust/geo-ci:proj-9.1.0-rust-1.70"
- "georust/geo-ci:proj-9.2.1-rust-1.69"
- "georust/geo-ci:proj-9.2.1-rust-1.70"
container:
image: ${{ matrix.container_image }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- run: cargo check --all-targets --no-default-features
# we don't want to test `proj-network` because it only enables the `proj` feature
- run: cargo test --features "use-proj use-serde"
Expand All @@ -122,15 +122,15 @@ jobs:
# giving us about 6 months of coverage.
#
# Minimum supported rust version (MSRV)
- "georust/geo-ci:rust-1.63"
- "georust/geo-ci:proj-9.2.1-rust-1.63"
# Two most recent releases - we omit older ones for expedient CI
- "georust/geo-ci:proj-9.1.0-rust-1.69"
- "georust/geo-ci:proj-9.1.0-rust-1.70"
- "georust/geo-ci:proj-9.2.1-rust-1.69"
- "georust/geo-ci:proj-9.2.1-rust-1.70"
container:
image: ${{ matrix.container_image }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- run: cargo check --all-targets
- run: cargo test

Expand All @@ -145,21 +145,21 @@ jobs:
matrix:
container_image:
# Fuzz only on latest
- "georust/geo-ci:proj-9.1.0-rust-1.70"
- "georust/geo-ci:proj-9.2.1-rust-1.70"
container:
image: ${{ matrix.container_image }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- run: cargo build --bins

bench:
name: bench
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
container:
image: georust/geo-ci:proj-9.1.0-rust-1.70
image: georust/geo-ci:proj-9.2.1-rust-1.70
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- run: cargo bench --no-run
1 change: 1 addition & 0 deletions geo/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

* Implement "Closest Point" from a `Point` on a `Geometry` using spherical geometry. <https://github.com/georust/geo/pull/958>
* Bump CI containers to use libproj 9.2.1

## 0.25.1

Expand Down

0 comments on commit 22e6956

Please sign in to comment.