Skip to content

Commit

Permalink
Bump MSRV to 1.70 (#188)
Browse files Browse the repository at this point in the history
* Bump MSRV to 1.70

* Bump MSRV in main cargo

* Update checkout action
  • Loading branch information
urschrei committed Jan 17, 2024
1 parent 8db09d6 commit ae91aba
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ jobs:
matrix:
container_image:
# Minimum supported rust (MSRV)
- "georust/proj-ci:proj-9.3.1-rust-1.65"
- "georust/proj-ci:proj-9.3.1-rust-1.70"
# Latest stable rust
- "georust/proj-ci:proj-9.3.1-rust-1.74"
- "georust/proj-ci:proj-9.3.1-rust-1.75"
features:
- ""
- "--features network"
Expand All @@ -67,7 +67,7 @@ jobs:
image: ${{ matrix.container_image }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- run: cargo build ${{ matrix.features }}
- run: cargo test ${{ matrix.features }}

Expand All @@ -81,7 +81,7 @@ jobs:
features: ["", "--features network"]
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- run: cargo build ${{ matrix.features }}
- run: cargo test ${{ matrix.features }}

Expand All @@ -98,40 +98,40 @@ jobs:
include:
# Minimum supported rust (MSRV)
- container:
image: georust/proj-ci:proj-9.3.1-rust-1.65
image: georust/proj-ci:proj-9.3.1-rust-1.70
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
features: ""
- container:
image: georust/proj-ci:proj-9.3.1-rust-1.65
image: georust/proj-ci:proj-9.3.1-rust-1.70
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: "--features bundled_proj"
- container:
image: georust/proj-ci-without-system-proj:proj-9.3.1-rust-1.65
image: georust/proj-ci-without-system-proj:proj-9.3.1-rust-1.70
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: ""

# Latest stable rust
- container:
image: georust/proj-ci:proj-9.3.1-rust-1.74
image: georust/proj-ci:proj-9.3.1-rust-1.75
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
features: ""
- container:
image: georust/proj-ci:proj-9.3.1-rust-1.74
image: georust/proj-ci:proj-9.3.1-rust-1.75
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: "--features bundled_proj"
- container:
image: georust/proj-ci-without-system-proj:proj-9.3.1-rust-1.74
image: georust/proj-ci-without-system-proj:proj-9.3.1-rust-1.75
env:
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
features: ""
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- run: cargo build ${{ matrix.features }}
- run: cargo test ${{ matrix.features }}

Expand All @@ -146,7 +146,7 @@ jobs:
working-directory: proj-sys
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
# At some point around Feb. 2023, the GH macos CI runner no longer had
# pkg-config installed by default, so we need to install it manually.
#
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["proj", "projection", "osgeo", "geo"]
license = "MIT OR Apache-2.0"
readme = "README.md"
edition = "2018"
rust-version = "1.65"
rust-version = "1.70"

[dependencies]
proj-sys = { version = "0.23.1", path = "proj-sys" }
Expand Down
2 changes: 1 addition & 1 deletion proj-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["proj", "projection", "osgeo", "geo", "geospatial"]
license = "MIT OR Apache-2.0"
edition = "2021"
links = "proj"
rust-version = "1.65"
rust-version = "1.70"

[dependencies]

Expand Down

0 comments on commit ae91aba

Please sign in to comment.