From 7a31f50c56901eccfc3ca2b105ef110edc464512 Mon Sep 17 00:00:00 2001 From: eric Date: Thu, 2 May 2024 02:46:18 +0800 Subject: [PATCH] chore: fix cross build --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- scripts/build_cross.sh | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100755 scripts/build_cross.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb68d8e10..0217c2cc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: run: | export CFG_COMMIT_HASH=`git log --pretty=format:'%h' -n 1` export CFG_COMMIT_DATE=`git log --format="%ci" -n 1` - ./scripts/build_cross.sh ${{ matrix.target }} + cross build --release --target ${{ matrix.target }} - name: rename and compress artifacts if: ${{ matrix.target == 'x86_64-pc-windows-gnu' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed94c8c6a..26c9a50a7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: run: | export CFG_COMMIT_HASH=`git log --pretty=format:'%h' -n 1` export CFG_COMMIT_DATE=`git log --format="%ci" -n 1` - ./scripts/build_cross.sh ${{ matrix.target }} + cross build --release --target ${{ matrix.target }} - name: rename and compress artifacts if: ${{ matrix.target == 'x86_64-pc-windows-gnu' }} diff --git a/scripts/build_cross.sh b/scripts/build_cross.sh deleted file mode 100755 index d8775dc0b..000000000 --- a/scripts/build_cross.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -target=$1 - -if [[ "$target" == *"mips"* ]]; then - cross build --release --target $target --manifest-path leaf-cli/Cargo.toml --no-default-features --features "default-openssl" -else - cross build --release --target $target --manifest-path leaf-cli/Cargo.toml --no-default-features --features "default-ring" -fi