From 74243e339a131d8ca08e26f51b900f0d373eae10 Mon Sep 17 00:00:00 2001 From: danieleades <33452915+danieleades@users.noreply.github.com> Date: Sun, 22 Oct 2023 17:48:43 +0100 Subject: [PATCH] ci: Update Rust version and runner step --- .github/workflows/test.yml | 25 +++++++------------------ Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b24aabdf10..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 @@ -54,13 +51,12 @@ jobs: - uses: actions/checkout@master - uses: dtolnay/rust-toolchain@master with: - toolchain: stable - override: true + toolchain: 1.65.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] @@ -101,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 @@ -117,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 @@ -130,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 diff --git a/Cargo.toml b/Cargo.toml index e07ddb384d..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.60.0" +rust-version = "1.65.0" [build-dependencies] crc-any = { version = "2.3.0", default-features = false }