From 8b6018fc7f3e2f3281ee99afde5511a417f86fed Mon Sep 17 00:00:00 2001
From: Vo Van Nghia <git@vnghia.com>
Date: Wed, 11 Dec 2024 14:02:38 +0100
Subject: [PATCH] ci: run nextest for cross build

---
 .github/workflows/main.yaml | 6 +-----
 ci/cross-pre-build.sh       | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 6a5fbe440..28e23e194 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -151,11 +151,7 @@ jobs:
       - name: Build and test
         run: |
           ${{ matrix.platform.command }} build --locked --target ${{ matrix.platform.target }} --profile ${{ steps.build.outputs.profile }}
-          if [[ ${{ matrix.platform.command }} == 'cross' ]]; then
-            cross test --locked --target ${{ matrix.platform.target }} --profile ${{ steps.build.outputs.profile }} --workspace
-          else
-            cargo nextest run --locked --target ${{ matrix.platform.target }} --profile ci --cargo-profile ${{ steps.build.outputs.profile }} --workspace
-          fi
+          ${{ matrix.platform.command }} == 'cross' && format('cross-util run --target {0} --', matrix.platform.target) || '' }} cargo nextest run --locked --target ${{ matrix.platform.target }} --profile ci --cargo-profile ${{ steps.build.outputs.profile }} --workspace
         env:
           LASTFM_KEY: ${{ steps.build.outputs.docker-arch == 'amd64' && secrets.LASTFM_KEY || '' }}
           SPOTIFY_ID: ${{ steps.build.outputs.docker-arch == 'amd64' && secrets.SPOTIFY_ID || '' }}
diff --git a/ci/cross-pre-build.sh b/ci/cross-pre-build.sh
index 18166e42a..a1311bfa1 100755
--- a/ci/cross-pre-build.sh
+++ b/ci/cross-pre-build.sh
@@ -4,3 +4,5 @@ set -euxo pipefail
 if [[ "$CROSS_TARGET" == "aarch64-unknown-linux-gnu" ]]; then
   apt-get update && apt-get --assume-yes install libclang-10-dev
 fi
+
+curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin