ci: use save-image alias

georgik · Jan 22, 2024 · f263279 · f263279
1 parent 443ceb5
commit f263279
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/build-rust-no_std-hello-world.yaml b/.github/workflows/build-rust-no_std-hello-world.yaml
@@ -87,8 +87,8 @@ jobs:
             #VERSION=$(grep '^version =' Cargo.toml | cut -d '"' -f2)
             #CHIP=$(grep 'hal = { package =' Cargo.toml | cut -d '"' -f2 | cut -d '-' -f1)
 
-            cargo esp32 --release
-            #cargo espflash save-image --chip "${TARGET}" --release --merge --skip-padding ${OUTPUT_BIN}
+            # Using alias from .cargo/config.toml
+            cargo "save-image-${TARGET}" --release --merge --skip-padding ${OUTPUT_BIN}
 
             # If skip-wokwi-test.toml exists, skip Wokwi test
             #if [ -f "skip-wokwi-test.toml" ]; then

diff --git a/examples/rust/no_std/hello-world/.cargo/config.toml b/examples/rust/no_std/hello-world/.cargo/config.toml
@@ -7,13 +7,21 @@ esp32c3 = "run --features esp32c3 --target riscv32imc-unknown-none-elf  --featur
 esp32c6 = "run --features esp32c6 --target riscv32imac-unknown-none-elf --features esp32c6-hal/default"
 esp32h2 = "run --features esp32h2 --target riscv32imac-unknown-none-elf --features esp32h2-hal/default"
 
-besp32 =   "build --features   esp32 --target xtensa-esp32-none-elf        --features esp32-hal/default"
-besp32s2 = "build --features esp32s2 --target xtensa-esp32s2-none-elf      --features esp32s2-hal/default"
-besp32s3 = "build --features esp32s3 --target xtensa-esp32s3-none-elf      --features esp32s3-hal/default"
-besp32c2 = "build --features esp32c2 --target riscv32imc-unknown-none-elf  --features esp32c2-hal/default"
-besp32c3 = "build --features esp32c3 --target riscv32imc-unknown-none-elf  --features esp32c3-hal/default"
-besp32c6 = "build --features esp32c6 --target riscv32imac-unknown-none-elf --features esp32c6-hal/default"
-besp32h2 = "build --features esp32h2 --target riscv32imac-unknown-none-elf --features esp32h2-hal/default"
+build-esp32 =   "build --features   esp32 --target xtensa-esp32-none-elf        --features esp32-hal/default"
+build-esp32s2 = "build --features esp32s2 --target xtensa-esp32s2-none-elf      --features esp32s2-hal/default"
+build-esp32s3 = "build --features esp32s3 --target xtensa-esp32s3-none-elf      --features esp32s3-hal/default"
+build-esp32c2 = "build --features esp32c2 --target riscv32imc-unknown-none-elf  --features esp32c2-hal/default"
+build-esp32c3 = "build --features esp32c3 --target riscv32imc-unknown-none-elf  --features esp32c3-hal/default"
+build-esp32c6 = "build --features esp32c6 --target riscv32imac-unknown-none-elf --features esp32c6-hal/default"
+build-esp32h2 = "build --features esp32h2 --target riscv32imac-unknown-none-elf --features esp32h2-hal/default"
+
+save-image-esp32 =   "espflash save-image --chip esp32   --features   esp32 --target xtensa-esp32-none-elf        --features esp32-hal/default"
+save-image-esp32s2 = "espflash save-image --chip esp32s2 --features esp32s2 --target xtensa-esp32s2-none-elf      --features esp32s2-hal/default"
+save-image-esp32s3 = "espflash save-image --chip esp32s3 --features esp32s3 --target xtensa-esp32s3-none-elf      --features esp32s3-hal/default"
+save-image-esp32c2 = "espflash save-image --chip esp32c2 --features esp32c2 --target riscv32imc-unknown-none-elf  --features esp32c2-hal/default"
+save-image-esp32c3 = "espflash save-image --chip esp32c3 --features esp32c3 --target riscv32imc-unknown-none-elf  --features esp32c3-hal/default"
+save-image-esp32c6 = "espflash save-image --chip esp32c6 --features esp32c6 --target riscv32imac-unknown-none-elf --features esp32c6-hal/default"
+save-image-esp32h2 = "espflash save-image --chip esp32h2 --features esp32h2 --target riscv32imac-unknown-none-elf --features esp32h2-hal/default"
 
 [target.riscv32imc-unknown-none-elf]
 runner = "espflash flash --monitor"