From 3a96548b45c97018a7305453437bcf210032d00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Wed, 4 Dec 2024 09:49:58 +0100 Subject: [PATCH] Fix msrv and ieee802154 --- .github/workflows/ci.yml | 14 +++++++------- esp-ieee802154/src/lib.rs | 3 +++ xtask/src/main.rs | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8bef8ccac6..57092a752f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,10 +137,10 @@ jobs: - name: msrv RISCV (esp-wifi) run: | - cargo xtask build-package --features=esp32c2,wifi,ble --target=riscv32imc-unknown-none-elf esp-wifi - cargo xtask build-package --features=esp32c3,wifi,ble --target=riscv32imc-unknown-none-elf esp-wifi - cargo xtask build-package --features=esp32c6,wifi,ble --target=riscv32imac-unknown-none-elf esp-wifi - cargo xtask build-package --features=esp32h2,ble --target=riscv32imac-unknown-none-elf esp-wifi + cargo xtask build-package --features=esp32c2,wifi,ble,esp-hal/unstable --target=riscv32imc-unknown-none-elf esp-wifi + cargo xtask build-package --features=esp32c3,wifi,ble,esp-hal/unstable --target=riscv32imc-unknown-none-elf esp-wifi + cargo xtask build-package --features=esp32c6,wifi,ble,esp-hal/unstable --target=riscv32imac-unknown-none-elf esp-wifi + cargo xtask build-package --features=esp32h2,ble,esp-hal/unstable --target=riscv32imac-unknown-none-elf esp-wifi # Verify the MSRV for all Xtensa chips: - name: msrv Xtensa (esp-hal) @@ -151,9 +151,9 @@ jobs: - name: msrv Xtensa (esp-wifi) run: | - cargo xtask build-package --toolchain=esp --features=esp32,wifi,ble --target=xtensa-esp32-none-elf esp-wifi - cargo xtask build-package --toolchain=esp --features=esp32s2,wifi --target=xtensa-esp32s2-none-elf esp-wifi - cargo xtask build-package --toolchain=esp --features=esp32s3,wifi,ble --target=xtensa-esp32s3-none-elf esp-wifi + cargo xtask build-package --toolchain=esp --features=esp32,wifi,ble,esp-hal/unstable --target=xtensa-esp32-none-elf esp-wifi + cargo xtask build-package --toolchain=esp --features=esp32s2,wifi,esp-hal/unstable --target=xtensa-esp32s2-none-elf esp-wifi + cargo xtask build-package --toolchain=esp --features=esp32s3,wifi,ble,esp-hal/unstable --target=xtensa-esp32s3-none-elf esp-wifi - name: msrv (esp-lp-hal) run: | diff --git a/esp-ieee802154/src/lib.rs b/esp-ieee802154/src/lib.rs index 15d8bf3ad33..65400db64da 100644 --- a/esp-ieee802154/src/lib.rs +++ b/esp-ieee802154/src/lib.rs @@ -6,6 +6,9 @@ //! This library is intended to be used to implement support for higher-level //! communication protocols, for example [esp-openthread]. //! +//! Note that this crate currently requires you to enable the `unstable` feature +//! on `esp-hal`. +//! //! [IEEE 802.15.4]: https://en.wikipedia.org/wiki/IEEE_802.15.4 //! [esp-openthread]: https://github.com/esp-rs/esp-openthread //! diff --git a/xtask/src/main.rs b/xtask/src/main.rs index e7ca2754b36..775bb86829c 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -652,7 +652,7 @@ fn lint_packages(workspace: &Path, args: LintPackagesArgs) -> Result<()> { Package::EspIeee802154 => { if device.contains("ieee802154") { - let features = format!("--features={chip},sys-logs"); + let features = format!("--features={chip},sys-logs,esp-hal/unstable"); lint_package( chip, &path,