Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Revert "feat: Use stable channel instead of nightly" #72

Merged
merged 1 commit into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl Chip {
pub fn toolchain(&self) -> &'static str {
match self {
Chip::Esp32 | Chip::Esp32s2 | Chip::Esp32s3 => "+esp",
_ => "+stable",
_ => "+nightly",
}
}

Expand Down