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

Remove toolchain question #40

Merged
merged 2 commits into from
Jul 19, 2022
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ jobs:
- name: Setup | ldproxy
run: cargo install ldproxy
- name: (STD, PIO, V4.3.2) Generate
run: cargo generate --git https://github.com/ivmarkov/esp-idf-template cargo --name test --vcs none --silent -d mcu=esp32c3 -d toolchain=nightly -d std=true -d espidfver=v4.3.2 -d devcontainer=false
run: cargo generate --git https://github.com/ivmarkov/esp-idf-template cargo --name test --vcs none --silent -d mcu=esp32c3 -d std=true -d espidfver=v4.3.2 -d devcontainer=false
- name: (STD, PIO, V4.3.2) Build | Fmt Check
run: cd test; cargo fmt -- --check
- name: (STD, PIO, V4.3.2) Build | Clippy
run: cd test; cargo clippy --features pio --no-deps -- -Dwarnings
- name: (STD, PIO, V4.3.2) Build | Compile
run: cd test; cargo build --features pio
- name: (NOSTD, NATIVE, V4.4) Generate
run: cargo generate --git https://github.com/ivmarkov/esp-idf-template cargo --name testnostd --vcs none --silent -d mcu=esp32c3 -d toolchain=nightly -d std=false -d espidfver=v4.4 -d devcontainer=false
run: cargo generate --git https://github.com/ivmarkov/esp-idf-template cargo --name testnostd --vcs none --silent -d mcu=esp32c3 -d std=false -d espidfver=v4.4 -d devcontainer=false
- name: (NOSTD, NATIVE, V4.4) Build | Fmt Check
run: cd testnostd; cargo fmt -- --check
- name: (NOSTD, NATIVE, V4.4) Build | Clippy
Expand Down
4 changes: 0 additions & 4 deletions cargo/cargo-generate.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ mcu = { type = "string", prompt = "MCU", choices = [
"esp32s3",
"esp32c3",
], default = "esp32" }
toolchain = { type = "string", prompt = "Rust toolchain (beware: nightly works only for esp32c3!)", choices = [
"esp",
"nightly",
], default = "esp" }
std = { type = "bool", prompt = "STD support", default = true }
espidfver = { type = "string", prompt = "ESP-IDF native build version (v4.3.2 = previous stable, v4.4 = stable, mainline = UNSTABLE)", choices = [
"v4.4",
Expand Down
7 changes: 5 additions & 2 deletions cargo/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[toolchain]
{% if toolchain == "esp" %}channel = "esp"{% endif %}
{% if toolchain == "nightly" %}channel = "nightly"{% endif %}
{% if mcu == "esp32c3" -%}
channel = "nightly"
{%- else -%}
channel = "esp"
{%- endif %}