diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 28e23e19..5d36dc48 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -151,7 +151,7 @@ jobs: - name: Build and test run: | ${{ matrix.platform.command }} build --locked --target ${{ matrix.platform.target }} --profile ${{ steps.build.outputs.profile }} - ${{ 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 + ${{ matrix.platform.command == 'cross' && format('cross-util run --target {0} -- /usr/bin/cargo-nextest', 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 a1311bfa..bd678215 100755 --- a/ci/cross-pre-build.sh +++ b/ci/cross-pre-build.sh @@ -5,4 +5,4 @@ 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 +curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C /usr/bin/