From af0963713f79e7e51781216e9733c07c3971dc05 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Arcos Date: Wed, 18 Sep 2024 10:26:14 +0200 Subject: [PATCH] Revert "feat: Use stable channel instead of nightly" This reverts commit 0ad8445acf5db6e2fea266b4cc6dd8cceb54c5f8. --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- README.md | 8 ++++---- src/main.rs | 11 ++++++++--- xtask/src/main.rs | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c2c5e6..f5fa236 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,7 +130,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@v1 with: - toolchain: stable + toolchain: nightly components: rustfmt - uses: Swatinem/rust-cache@v2 - name: cargo fmt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e6138c3..3cd6e3a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: if: matrix.build.chip != 'esp32' && matrix.build.chip != 'esp32s2' && matrix.build.chip != 'esp32s3' with: target: ${{ matrix.build.target }} - toolchain: stable + toolchain: nightly components: rust-src # Xtensa toolchain - uses: esp-rs/xtensa-toolchain@v1.5 diff --git a/README.md b/README.md index f675a07..8a1320c 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,16 @@ In order to build the flasher stub manually, you must specify the appropriate to cargo +esp build --release --features=esp32 --target=xtensa-esp32-none-elf # ESP32-C2 -cargo +stable build --release --features=esp32c2 --target=riscv32imc-unknown-none-elf +cargo +nightly build --release --features=esp32c2 --target=riscv32imc-unknown-none-elf # ESP32-C3 -cargo +stable build --release --features=esp32c3 --target=riscv32imc-unknown-none-elf +cargo +nightly build --release --features=esp32c3 --target=riscv32imc-unknown-none-elf # ESP32-C6 -cargo +stable build --release --features=esp32c6 --target=riscv32imac-unknown-none-elf +cargo +nightly build --release --features=esp32c6 --target=riscv32imac-unknown-none-elf # ESP32-H2 -cargo +stable build --release --features=esp32h2 --target=riscv32imac-unknown-none-elf +cargo +nightly build --release --features=esp32h2 --target=riscv32imac-unknown-none-elf # ESP32-S2 cargo +esp build --release --features=esp32s2 --target=xtensa-esp32s2-none-elf diff --git a/src/main.rs b/src/main.rs index bbb1c9e..65d52e6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,17 +7,22 @@ use flasher_stub::{ dprintln, hal::{ clock::{ClockControl, Clocks}, - entry, gpio, + entry, + gpio, peripherals::{self, Peripherals}, prelude::*, uart::{ config::{Config, DataBits, Parity, StopBits}, - ClockSource, TxRxPins, Uart, + ClockSource, + TxRxPins, + Uart, }, Blocking, }, protocol::Stub, - targets, Transport, TransportMethod, + targets, + Transport, + TransportMethod, }; use static_cell::StaticCell; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 33df706..d7d02fe 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -28,7 +28,7 @@ impl Chip { pub fn toolchain(&self) -> &'static str { match self { Chip::Esp32 | Chip::Esp32s2 | Chip::Esp32s3 => "+esp", - _ => "+stable", + _ => "+nightly", } }