cleanup

esp-rs · Feb 13, 2025 · edfe946 · edfe946
1 parent 51b5bbc
commit edfe946
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 35 deletions.
diff --git a/.github/actions/check-esp-hal/action.yml b/.github/actions/check-esp-hal/action.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,14 +56,14 @@ jobs:
       matrix:
         device: [
             # RISC-V devices:
-            { soc: "esp32c2", target: "riscv32imc-unknown-none-elf", toolchain: "stable" },
-            { soc: "esp32c3", target: "riscv32imc-unknown-none-elf", toolchain: "stable" },
-            { soc: "esp32c6", target: "riscv32imac-unknown-none-elf", toolchain: "stable" },
-            { soc: "esp32h2", target: "riscv32imac-unknown-none-elf", toolchain: "stable" },
+            { soc: "esp32c2", toolchain: "stable" },
+            { soc: "esp32c3", toolchain: "stable" },
+            { soc: "esp32c6", toolchain: "stable" },
+            { soc: "esp32h2", toolchain: "stable" },
             # Xtensa devices:
-            { soc: "esp32", target: "xtensa-esp32-none-elf", toolchain: "esp" },
-            { soc: "esp32s2", target: "xtensa-esp32s2-none-elf", toolchain: "esp" },
-            { soc: "esp32s3", target: "xtensa-esp32s3-none-elf", toolchain: "esp" },
+            { soc: "esp32", toolchain: "esp" },
+            { soc: "esp32s2", toolchain: "esp" },
+            { soc: "esp32s3", toolchain: "esp" },
           ]
     steps:
       - uses: actions/checkout@v4
@@ -86,11 +86,8 @@ jobs:
           cache-all-crates: true
 
       - name: Build and Check
-        uses: ./.github/actions/check-esp-hal
-        with:
-          device: ${{ matrix.device.soc }}
-          target: ${{ matrix.device.target }}
-          toolchain: ${{ matrix.device.toolchain }}
+        shell: bash
+        run: cargo +${{ matrix.device.toolchain }} xtask ci ${{ matrix.device.soc }}
 
   extras:
     runs-on: macos-m1-self-hosted

diff --git a/.github/workflows/ci_nightly.yml b/.github/workflows/ci_nightly.yml
@@ -45,11 +45,8 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build and Check
-        uses: ./.github/actions/check-esp-hal
-        with:
-          device: ${{ matrix.device.soc }}
-          target: ${{ matrix.device.target }}
-          toolchain: nightly
+        shell: bash
+        run: cargo +nightly xtask ci ${{ matrix.device.soc }}
 
       - if: failure()
         name: Create or Update GitHub Issue