From 4dce5895196a04a56a2599fa0b6db39a9cb459d8 Mon Sep 17 00:00:00 2001 From: Daniel Eades Date: Sun, 22 Oct 2023 16:44:47 +0100 Subject: [PATCH 1/4] align MSRV check with 'rust-version' --- .github/workflows/test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b24aabdf10..7f3c63c95b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,13 +54,12 @@ jobs: - uses: actions/checkout@master - uses: dtolnay/rust-toolchain@master with: - toolchain: stable - override: true + toolchain: 1.60.0 - uses: actions-rs/cargo@v1 with: use-cross: true command: check - args: --all-targets + args: --all --all-targets build: needs: [formatting, linting, internal-tests, mavlink-dump, msrv] From 2c1e76c3c37a4e890ed6ae42e02fee5200968f3e Mon Sep 17 00:00:00 2001 From: Daniel Eades Date: Sun, 22 Oct 2023 16:54:02 +0100 Subject: [PATCH 2/4] bump MSRV --- .github/workflows/test.yml | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f3c63c95b..93cb18312e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@master - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.60.0 + toolchain: 1.63.0 - uses: actions-rs/cargo@v1 with: use-cross: true diff --git a/Cargo.toml b/Cargo.toml index e07ddb384d..2706318ce5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" license = "MIT/Apache-2.0" repository = "https://github.com/mavlink/rust-mavlink" edition = "2018" -rust-version = "1.60.0" +rust-version = "1.63.0" [build-dependencies] crc-any = { version = "2.3.0", default-features = false } From 2151cc3eaca0a6bb67f90842da92081be9af8ee1 Mon Sep 17 00:00:00 2001 From: Daniel Eades Date: Sun, 22 Oct 2023 17:01:11 +0100 Subject: [PATCH 3/4] bump MSRV --- .github/workflows/test.yml | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 93cb18312e..65cdfd2e23 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@master - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.63.0 + toolchain: 1.65.0 - uses: actions-rs/cargo@v1 with: use-cross: true diff --git a/Cargo.toml b/Cargo.toml index 2706318ce5..d591a449a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" license = "MIT/Apache-2.0" repository = "https://github.com/mavlink/rust-mavlink" edition = "2018" -rust-version = "1.63.0" +rust-version = "1.65.0" [build-dependencies] crc-any = { version = "2.3.0", default-features = false } From 86a0af84df3374d77a655dbc38cc6c0f60643f54 Mon Sep 17 00:00:00 2001 From: Daniel Eades Date: Sun, 22 Oct 2023 17:11:20 +0100 Subject: [PATCH 4/4] tidy 'test.yml' --- .github/workflows/test.yml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 65cdfd2e23..dce4f54c07 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,9 +7,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable components: rustfmt - name: Run rustfmt run: cargo fmt --all -- --check @@ -42,9 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - uses: dtolnay/rust-toolchain@master - with: - toolchain: stable + - uses: dtolnay/rust-toolchain@stable - name: Build mavlink-dump run: cargo build --verbose --bin mavlink-dump --features ardupilotmega @@ -100,11 +97,9 @@ jobs: - name: Building ${{ matrix.TARGET }} run: echo "${{ matrix.TARGET }}" - uses: actions/checkout@master - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable target: ${{ matrix.TARGET }} - override: true - uses: actions-rs/cargo@v1 with: use-cross: true @@ -116,11 +111,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly target: thumbv7em-none-eabihf - override: true - name: Build run: cargo +nightly build --target thumbv7em-none-eabihf --manifest-path examples/embedded/Cargo.toml --out-dir $PWD --release -Z unstable-options @@ -129,10 +122,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - uses: actions-rs/toolchain@v1.0.6 - with: - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - name: Build docs run: cargo doc - name: Deploy