From 302702dd58c53a50aa84892eac79a5300c247752 Mon Sep 17 00:00:00 2001 From: James Munns Date: Thu, 13 Nov 2025 17:42:42 +0100 Subject: Tweak CI workflows for embassy-mcxa --- .github/workflows/cargo-vet-pr-comment.yml | 2 +- .github/workflows/check.yml | 13 +++++++++---- .github/workflows/nostd.yml | 11 +++-------- .github/workflows/rolling.yml | 4 ++++ 4 files changed, 17 insertions(+), 13 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/cargo-vet-pr-comment.yml b/.github/workflows/cargo-vet-pr-comment.yml index 4dec76822..fafb21641 100644 --- a/.github/workflows/cargo-vet-pr-comment.yml +++ b/.github/workflows/cargo-vet-pr-comment.yml @@ -134,4 +134,4 @@ jobs: comment-tag: [cargo-vet] --> - edit-mode: replace \ No newline at end of file + edit-mode: replace diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 5d4271145..3f116426f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - workdir: [ ".", "examples/rt633", "examples/rt685s-evk",] + workdir: [ ".", "examples",] steps: - uses: actions/checkout@v5 @@ -45,6 +45,7 @@ jobs: uses: dtolnay/rust-toolchain@nightly with: components: rustfmt + targets: thumbv8m.main-none-eabihf - name: cargo fmt --check run: cargo fmt --check @@ -75,6 +76,7 @@ jobs: with: toolchain: ${{ matrix.toolchain }} components: clippy + targets: thumbv8m.main-none-eabihf - name: cargo clippy working-directory: ${{ matrix.workdir }} @@ -110,6 +112,8 @@ jobs: - name: Install nightly uses: dtolnay/rust-toolchain@nightly + with: + targets: thumbv8m.main-none-eabihf - name: cargo doc run: | @@ -136,9 +140,7 @@ jobs: with: toolchain: stable components: clippy - - - name: rustup target add thumbv8m.main-none-eabihf - run: rustup target add thumbv8m.main-none-eabihf + targets: thumbv8m.main-none-eabihf - name: cargo hack run: cargo hack --feature-powerset check @@ -156,6 +158,8 @@ jobs: - name: Install stable uses: dtolnay/rust-toolchain@stable + with: + targets: thumbv8m.main-none-eabihf - name: cargo install cargo-deny uses: EmbarkStudios/cargo-deny-action@v2 @@ -199,6 +203,7 @@ jobs: uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.msrv }} + targets: thumbv8m.main-none-eabihf - name: cargo +${{ matrix.msrv }} check run: | diff --git a/.github/workflows/nostd.yml b/.github/workflows/nostd.yml index fbada0516..6083577da 100644 --- a/.github/workflows/nostd.yml +++ b/.github/workflows/nostd.yml @@ -20,10 +20,6 @@ jobs: runs-on: ubuntu-latest name: ${{ matrix.target }} - strategy: - matrix: - target: [thumbv8m.main-none-eabihf] - steps: - uses: actions/checkout@v5 with: @@ -31,13 +27,12 @@ jobs: - name: Install stable uses: dtolnay/rust-toolchain@stable - - - name: rustup target add ${{ matrix.target }} - run: rustup target add ${{ matrix.target }} + with: + targets: thumbv8m.main-none-eabihf - name: Show variable run: echo ${{ env.TOKEN }} - name: cargo check run: | - cargo check --target ${{ matrix.target }} --all-features --locked + cargo check --target thumbv8m.main-none-eabihf --all-features --locked diff --git a/.github/workflows/rolling.yml b/.github/workflows/rolling.yml index 4c9e9718a..386c0df5c 100644 --- a/.github/workflows/rolling.yml +++ b/.github/workflows/rolling.yml @@ -25,6 +25,9 @@ jobs: submodules: true - name: Install stable uses: dtolnay/rust-toolchain@stable + with: + targets: thumbv8m.main-none-eabihf + - name: cargo install cargo-hack uses: taiki-e/install-action@cargo-hack - name: cargo check @@ -62,6 +65,7 @@ jobs: uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.msrv }} + targets: thumbv8m.main-none-eabihf - name: cargo +${{ matrix.msrv }} check run: | cargo update -- cgit From 9387d3352a39a903757860568e41890b022c990f Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 13 Nov 2025 08:52:19 -0800 Subject: Install cargo-hack before attempting to use it --- .github/workflows/check.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.github/workflows') diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3f116426f..7aec2f489 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -142,6 +142,9 @@ jobs: components: clippy targets: thumbv8m.main-none-eabihf + - name: cargo install cargo-hack + uses: taiki-e/install-action@cargo-hack + - name: cargo hack run: cargo hack --feature-powerset check -- cgit From f1636f3913e06f84ec2a097924bd7154b9bb1a3c Mon Sep 17 00:00:00 2001 From: James Munns Date: Thu, 13 Nov 2025 18:04:06 +0100 Subject: Bump msrv --- .github/workflows/check.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 7aec2f489..8e05f5c5d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -180,7 +180,7 @@ jobs: strategy: fail-fast: false matrix: - msrv: ["1.90"] # We're relying on namespaced-features, which + msrv: ["1.91"] # We're relying on namespaced-features, which # was released in 1.60 # # We also depend on `fixed' which requires rust @@ -195,6 +195,8 @@ jobs: # embassy upstream switched to rust 1.85 # # unsigned_is_multiple_of requires 1.90, else we get clippy warnings + # + # mcxa-pac@0.1.0 requires rustc 1.91 name: ubuntu / ${{ matrix.msrv }} steps: -- cgit