From 28a2b89e968e2827721f6b82192ffcec155663af Mon Sep 17 00:00:00 2001 From: Shane Snover Date: Wed, 17 Apr 2024 16:54:09 -0600 Subject: [PATCH] Update to maintained action dtolnay/rust-toolchain instead of actions-rs --- .github/workflows/coproc.yml | 49 +++++++----------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) diff --git a/.github/workflows/coproc.yml b/.github/workflows/coproc.yml index ac1997b..4cd34e4 100644 --- a/.github/workflows/coproc.yml +++ b/.github/workflows/coproc.yml @@ -15,56 +15,25 @@ jobs: name: Check formatting runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Install rustfmt - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable components: rustfmt - profile: minimal - override: true - name: Format Nano - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all --check --manifest-path coproc-embassy/nano-ble-rgb/Cargo.toml + run: cargo fmt --all --check --manifest-path coproc-embassy/nano-ble-rgb/Cargo.toml - name: Format Pico - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all --check --manifest-path coproc-embassy/pi-pico-rgb/Cargo.toml + run: cargo fmt --all --check --manifest-path coproc-embassy/pi-pico-rgb/Cargo.toml build: name: Build firmwares needs: [format] runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Install rust toolchain for thumbv7em-none-eabi - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - profile: minimal - override: true - target: thumbv7em-none-eabi - - name: Install rust toolchain for thumbv6m-none-eabi - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - profile: minimal - override: true - target: thumbv6m-none-eabi + targets: "thumbv7em-none-eabi,thumbv6m-none-eabi" - name: Build Arduino Nano 33 BLE firmware - uses: actions-rs/cargo@v1 - with: - use-cross: true - command: build - args: --release --manifest-path coproc-embassy/nano-ble-rgb/Cargo.toml --target thumbv7em-none-eabi + run: cargo build --release --manifest-path coproc-embassy/nano-ble-rgb/Cargo.toml --target thumbv7em-none-eabi - name: Build Pi Pico firmware - uses: actions-rs/cargo@v1 - with: - use-cross: true - command: build - args: --release --manifest-path coproc-embassy/pi-pico-rgb/Cargo.toml --target thumbv6m-none-eabi + run: cargo build --release --manifest-path coproc-embassy/pi-pico-rgb/Cargo.toml --target thumbv6m-none-eabi