Skip to content

Commit e51c60a

Browse files
committed
xtask: Move efuse generator behind a feature
This prevents Python being necessary to build the xtask binary for other purposes.
1 parent 93fc7a9 commit e51c60a

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[alias]
22
xtask = "run --package xtask --"
3+
xgenerate-efuse-fields = "run --package xtask --features=efuse-generator -- generate-efuse-fields"
34
xrun = "run --package espflash --"

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
- uses: actions/checkout@v4
124124
- uses: dtolnay/rust-toolchain@stable
125125

126-
- run: cargo check -p xtask
126+
- run: cargo check -p xtask --all-features
127127

128128
# --------------------------------------------------------------------------
129129
# Test

.github/workflows/hil.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Install dependencies
4444
env:
4545
DEBIAN_FRONTEND: noninteractive
46-
run: apt-get update && apt-get -y install curl musl-tools pkg-config python3-dev python3-intelhex python3-reedsolo python3-rich-click
46+
run: apt-get update && apt-get -y install curl musl-tools pkg-config
4747

4848
- name: Install toolchain
4949
run: |

xtask/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ version = "0.0.0"
44
edition = "2024"
55
publish = false
66

7+
[features]
8+
efuse-generator = ["pyo3"]
9+
710
[dependencies]
811
chrono = "0.4"
912
clap = { version = "4.5", features = ["derive"] }
1013
env_logger = "0.11"
1114
log = "0.4"
12-
pyo3 = { version = "0.27.1", features = ["auto-initialize"] }
15+
pyo3 = { version = "0.27.1", features = ["auto-initialize"], optional = true }
1316
serde = { version = "1.0", features = ["derive"] }
1417
serde_yaml = "0.9"

xtask/src/main.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use std::{env, path::PathBuf};
33
use clap::Parser;
44

55
// Import modules
6+
#[cfg(feature = "efuse-generator")]
67
mod efuse_generator;
78
mod test_runner;
89

@@ -15,6 +16,7 @@ pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
1516
#[derive(Debug, Parser)]
1617
enum Cli {
1718
/// Generate eFuse field definitions
19+
#[cfg(feature = "efuse-generator")]
1820
GenerateEfuseFields(efuse_generator::GenerateEfuseFieldsArgs),
1921

2022
/// Run espflash tests
@@ -49,6 +51,7 @@ fn main() -> Result<()> {
4951
};
5052

5153
match Cli::parse() {
54+
#[cfg(feature = "efuse-generator")]
5255
Cli::GenerateEfuseFields(args) => efuse_generator::generate_efuse_fields(&workspace, args),
5356
Cli::RunTests(args) => test_runner::run_tests(&workspace, args),
5457
}

0 commit comments

Comments
 (0)