Skip to content

Commit

Permalink
update MSRV checks to account for features
Browse files Browse the repository at this point in the history
  • Loading branch information
danieleades authored and patrickelectric committed Aug 26, 2024
1 parent 3285c6d commit a729400
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
21 changes: 9 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,19 @@ jobs:
msrv:
runs-on: ubuntu-latest
strategy:
matrix:
signing: ["", "--features signing"]
matrix:
features: ["", "--features serde,tokio-1", "--features signing"]
steps:
- uses: actions/checkout@master
- name: Get MSRV from Cargo.toml
run: |
MSRV=$(grep 'rust-version' Cargo.toml | sed 's/.*= *"\(.*\)".*/\1/')
echo "MSRV=$MSRV" >> $GITHUB_ENV
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.65.0
- uses: actions-rs/cargo@v1
with:
command: install
args: cross --locked
- uses: actions-rs/cargo@v1
with:
use-cross: true
command: check
args: --all --all-targets ${{ matrix.signing }}
toolchain: ${{ env.MSRV }}
- uses: taiki-e/install-action@cargo-no-dev-deps
- run: cargo no-dev-deps check --all --all-targets ${{ matrix.features }}

build:
needs: [formatting, linting, internal-tests, mavlink-dump, msrv]
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ byteorder = { version = "1.3.4", default-features = false }

[workspace.package]
edition = "2021"
rust-version = "1.70.0"
1 change: 1 addition & 0 deletions mavlink-bindgen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ license = "MIT/Apache-2.0"
description = "Library used by rust-mavlink."
readme = "README.md"
repository = "https://github.com/mavlink/rust-mavlink"
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion mavlink-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ readme = "../README.md"
license = "MIT/Apache-2.0"
repository = "https://github.com/mavlink/rust-mavlink"
edition.workspace = true
rust-version = "1.65.0"
rust-version.workspace = true

[dependencies]
crc-any = { workspace = true, default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion mavlink/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ readme = "../README.md"
license = "MIT/Apache-2.0"
repository = "https://github.com/mavlink/rust-mavlink"
edition.workspace = true
rust-version = "1.65.0"
rust-version.workspace = true

[build-dependencies]
mavlink-bindgen = { path = "../mavlink-bindgen", default-features = false }
Expand Down

0 comments on commit a729400

Please sign in to comment.