Check hal in GHA, small crates on mac, build hil on vm

esp-rs · Jan 31, 2025 · c6332b1 · c6332b1
1 parent 85c314d
commit c6332b1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
 
   esp-hal:
     name: esp-hal (${{ matrix.device.soc }})
-    runs-on: macos-m1-self-hosted
+    runs-on: ubuntu-latest
     env:
       SSID: SSID
       PASSWORD: PASSWORD
@@ -72,19 +72,10 @@ jobs:
           target: riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf
           toolchain: ${{ env.MSRV }}
           components: rust-src
-      - name: install esp toolchain
-        run: |
-          if [ ! -f "$HOME/.cargo/bin/espup" ]; then
-            curl -L https://github.com/esp-rs/espup/releases/latest/download/espup-aarch64-apple-darwin -o "$HOME/.cargo/bin/espup"
-            chmod a+x "$HOME/.cargo/bin/espup"
-          fi
-
-          source "$HOME/.cargo/env"
-          "$HOME/.cargo/bin/espup" install -l debug --export-file $HOME/exports --targets all --toolchain-version 1.84.0.0
-          source "$HOME/exports"
-          echo "$PATH" >> "$GITHUB_PATH"
-          echo "LIBCLANG_PATH=${LIBCLANG_PATH}" >> "$GITHUB_ENV"
-          rustup override unset
+      - uses: esp-rs/[email protected]
+        with:
+          ldproxy: false
+          version: 1.84.0.0
 
       - uses: Swatinem/rust-cache@v2
 
@@ -96,7 +87,7 @@ jobs:
           toolchain: ${{ matrix.device.toolchain }}
 
   extras:
-    runs-on: [self-hosted, X64]
+    runs-on: macos-m1-self-hosted
 
     steps:
       - uses: actions/checkout@v4
@@ -181,7 +172,7 @@ jobs:
   # Format
 
   rustfmt:
-    runs-on: [self-hosted, X64]
+    runs-on: macos-m1-self-hosted
 
     steps:
       - uses: actions/checkout@v4
@@ -200,7 +191,7 @@ jobs:
   # host tests
 
   host-tests:
-    runs-on: [self-hosted, X64]
+    runs-on: macos-m1-self-hosted
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
@@ -30,7 +30,7 @@ env:
 jobs:
   build-xtasks:
     name: Build xtasks | ${{ matrix.host.arch }}
-    runs-on: [self-hosted, X64]
+    runs-on: linux-x86_64-self-hosted
 
     strategy:
       fail-fast: false
@@ -70,7 +70,6 @@ jobs:
 
   build-tests:
     name: Build HIL Tests | ${{ matrix.target.soc }}
-    runs-on: macos-m1-self-hosted
 
     strategy:
       fail-fast: false
@@ -79,19 +78,28 @@ jobs:
           # RISC-V devices:
           - soc: esp32c2
             rust-target: riscv32imc-unknown-none-elf
+            runner: esp32c2-26mhz
           - soc: esp32c3
             rust-target: riscv32imc-unknown-none-elf
+            runner: esp32c3
           - soc: esp32c6
             rust-target: riscv32imac-unknown-none-elf
+            runner: esp32c6
           - soc: esp32h2
             rust-target: riscv32imac-unknown-none-elf
+            runner: esp32h2
           # # Xtensa devices:
           - soc: esp32
             rust-target: xtensa-esp32-none-elf
+            runner: esp32
           - soc: esp32s2
             rust-target: xtensa-esp32s2-none-elf
+            runner: esp32s2
           - soc: esp32s3
             rust-target: xtensa-esp32s3-none-elf
+            runner: esp32s3
+
+    runs-on: [self-hosted, "X64", "${{ matrix.target.runner }}"]
 
     steps:
       - uses: actions/checkout@v4
@@ -112,10 +120,8 @@ jobs:
       # Install the Rust toolchain for Xtensa devices:
       - if: contains(fromJson('["esp32", "esp32s2", "esp32s3"]'), matrix.target.soc)
         run: |
-          if [ ! -f "$HOME/.cargo/bin/espup" ]; then
-            curl -L https://github.com/esp-rs/espup/releases/latest/download/espup-aarch64-apple-darwin -o "$HOME/.cargo/bin/espup"
-            chmod a+x "$HOME/.cargo/bin/espup"
-          fi
+          curl -L https://github.com/esp-rs/espup/releases/latest/download/espup-x86_64-unknown-linux-gnu -o "$HOME/.cargo/bin/espup"
+          chmod a+x "$HOME/.cargo/bin/espup"
 
           source "$HOME/.cargo/env"
           "$HOME/.cargo/bin/espup" install -l debug --export-file $HOME/exports --targets all --toolchain-version 1.84.0.0