From 267c3cadf24d41b1543bc4edd29d484228fe8609 Mon Sep 17 00:00:00 2001 From: xoviat Date: Fri, 19 Mar 2021 10:46:13 -0500 Subject: [PATCH 1/2] ci: attempt to consolidate nrf examples --- .github/workflows/rust.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d184ebc4e..26e8e8c88 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -26,8 +26,8 @@ jobs: - package: embassy target: thumbv6m-none-eabi features: defmt -# - package: embassy-nrf-examples -# target: thumbv7em-none-eabi + - package: embassy-nrf-examples + target: thumbv7em-none-eabi - package: embassy-nrf target: thumbv7em-none-eabi features: 52810 @@ -94,16 +94,3 @@ jobs: with: command: fmt args: --all -- --check - - nrf_examples: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - components: rust-src, rustfmt - target: thumbv7em-none-eabi - override: true - - name: Build - run: (cd embassy-nrf-examples; cargo build --target thumbv7em-none-eabi --bins) From 6835ce431423f9136da61d220f5c479e4924f80e Mon Sep 17 00:00:00 2001 From: xoviat Date: Fri, 19 Mar 2021 10:52:27 -0500 Subject: [PATCH 2/2] ci: set target --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 26e8e8c88..9b3d3b29e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -79,7 +79,7 @@ jobs: - uses: actions-rs/cargo@v1 with: command: check - args: --package ${{ matrix.package }} --features=${{ matrix.features }} + args: --package ${{ matrix.package }} --features=${{ matrix.features }} --target=${{ matrix.target }} fmt: runs-on: ubuntu-latest