From 374f316f851a019a4334fdb965ded5772f4221d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Buga?= <bugadani@gmail.com>
Date: Fri, 31 Jan 2025 14:51:12 +0100
Subject: [PATCH] Build xtasks on the same runner

---
 .github/workflows/hil.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
index 04a3632248..bfb993750f 100644
--- a/.github/workflows/hil.yml
+++ b/.github/workflows/hil.yml
@@ -29,17 +29,8 @@ env:
 
 jobs:
   build-xtasks:
-    name: Build xtasks | ${{ matrix.host.arch }}
-    runs-on: macos-m1-self-hosted
-
-    strategy:
-      fail-fast: false
-      matrix:
-        host:
-          - arch: armv7
-            rust-target: armv7-unknown-linux-gnueabihf
-          - arch: aarch64
-            rust-target: aarch64-unknown-linux-gnu
+    name: Build xtasks
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -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 }}