Skip to content

Commit

Permalink
Revert "feat: Use stable channel instead of nightly"
Browse files Browse the repository at this point in the history
This reverts commit 0ad8445.
  • Loading branch information
SergioGasquez authored Sep 18, 2024
1 parent 0ad8445 commit af09637
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
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

0 comments on commit af09637

Please sign in to comment.