Use self-hosted mac mini for the small, auxiliary tasks (#3072)

* Delegate smaller tasks to mac runner * Build xtasks on the same runner * Test the toolchian action
esp-rs · Feb 3, 2025 · 9ff40f9 · 9ff40f9
1 parent 28e935a
commit 9ff40f9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
           toolchain: ${{ matrix.device.toolchain }}
 
   extras:
-    runs-on: ubuntu-latest
+    runs-on: macos-m1-self-hosted
 
     steps:
       - uses: actions/checkout@v4
@@ -97,8 +97,6 @@ jobs:
           toolchain: stable
       - uses: Swatinem/rust-cache@v2
 
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get -y install musl-tools libudev-dev pkg-config
       # Build the extra crates
       - name: Build the bench-server
         run: cd extras/bench-server && cargo build
@@ -111,9 +109,7 @@ jobs:
   # MSRV
 
   msrv:
-    runs-on: ubuntu-latest
-    env:
-      RUSTC_BOOTSTRAP: 1
+    runs-on: macos-m1-self-hosted
 
     steps:
       - uses: actions/checkout@v4
@@ -166,7 +162,7 @@ jobs:
   # Format
 
   rustfmt:
-    runs-on: ubuntu-latest
+    runs-on: macos-m1-self-hosted
 
     steps:
       - uses: actions/checkout@v4
@@ -185,7 +181,7 @@ jobs:
   # host tests
 
   host-tests:
-    runs-on: ubuntu-latest
+    runs-on: macos-m1-self-hosted
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
@@ -29,18 +29,9 @@ env:
 
 jobs:
   build-xtasks:
-    name: Build xtasks | ${{ matrix.host.arch }}
+    name: Build xtasks
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        host:
-          - arch: armv7
-            rust-target: armv7-unknown-linux-gnueabihf
-          - arch: aarch64
-            rust-target: aarch64-unknown-linux-gnu
-
     steps:
       - uses: actions/checkout@v4
         if: github.event_name != 'workflow_dispatch'
@@ -60,13 +51,21 @@ jobs:
         run: cargo install cross
 
       - name: Build xtasks
-        run: cross build --release --target ${{ matrix.host.rust-target }} -p xtask
+        run: |
+          cross build --release --target armv7-unknown-linux-gnueabihf -p xtask
+          cross build --release --target aarch64-unknown-linux-gnu -p xtask
+
+      - name: Upload artifact | armv7-unknown-linux-gnueabihf
+        uses: actions/upload-artifact@v4
+        with:
+          name: xtask-armv7
+          path: target/armv7-unknown-linux-gnueabihf/release/xtask
 
-      - name: Upload artifact
+      - name: Upload artifact | aarch64-unknown-linux-gnu
         uses: actions/upload-artifact@v4
         with:
-          name: xtask-${{ matrix.host.arch }}
-          path: target/${{ matrix.host.rust-target }}/release/xtask
+          name: xtask-aarch64
+          path: target/aarch64-unknown-linux-gnu/release/xtask
 
   build-tests:
     name: Build HIL Tests | ${{ matrix.target.soc }}