Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use stable channel #54

Merged
merged 4 commits into from
Aug 12, 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
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ARG CONTAINER_USER=esp
ARG CONTAINER_GROUP=esp
ARG NIGHTLY_VERSION=nightly-2023-11-14
ARG RUST_CHANNEL=stable
ARG ESP_BOARD=esp32c3

RUN apt-get update \
Expand All @@ -21,7 +21,7 @@ USER ${CONTAINER_USER}
WORKDIR /home/${CONTAINER_USER}

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
--default-toolchain ${NIGHTLY_VERSION} -y --profile minimal \
--default-toolchain ${RUST_CHANNEL} -y --profile minimal \
--component rust-src,clippy,rustfmt --target riscv32imc-unknown-none-elf

ENV PATH=${PATH}:$HOME/.cargo/bin
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"NIGHTLY_VERSION": "nightly-2023-11-14"
"RUST_CHANNEL": "stable"
}
},
"customizations": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: dtolnay/rust-toolchain@v1
with:
target: riscv32imc-unknown-none-elf
toolchain: nightly
toolchain: stable
components: rust-src

- run: cargo build --release
Expand Down
2 changes: 1 addition & 1 deletion advanced/stack-overflow-detection/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-11-14"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]
5 changes: 2 additions & 3 deletions book/src/02_2_software.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ Follow the steps below for a default installation of the ESP32-C3 platform tooli

✅ If you haven't got Rust on your computer, obtain it via <https://rustup.rs/>

Furthermore, for ESP32-C3, a [*nightly* version](https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust) of the Rust toolchain is currently required, for this training we will use `nightly-2023-11-14` version.

✅ Install *nightly* Rust and add support for the target architecture using the following command:
✅ Install Rust *stable* channel, if you haven't already, and add support for the target architecture using the following command:

```console
rustup toolchain install nightly-2023-11-14 --component rust-src --target riscv32imc-unknown-none-elf
rustup toolchain install stable --component rust-src --target riscv32imc-unknown-none-elf
```

🔎 Rust is capable of cross-compiling to any supported target (see `rustup target list`). By default, only the native architecture of your system is installed.
Expand Down
2 changes: 1 addition & 1 deletion intro/blinky/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-11-14"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]
2 changes: 1 addition & 1 deletion intro/button-interrupt/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-11-14"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]
2 changes: 1 addition & 1 deletion intro/button/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-11-14"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]
2 changes: 1 addition & 1 deletion intro/defmt/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]

2 changes: 1 addition & 1 deletion intro/dma/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-11-14"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]
2 changes: 1 addition & 1 deletion intro/hello-world/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-11-14"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]
2 changes: 1 addition & 1 deletion intro/http-client/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-11-14"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]
2 changes: 1 addition & 1 deletion intro/panic/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-11-14"
channel = "stable"
components = ["rust-src"]
targets = ["riscv32imc-unknown-none-elf"]