From 68a1ef44162830e4b858393a56a544dba972a68c Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 9 Apr 2025 16:14:21 +0200 Subject: [PATCH] fix(ci): add variables to only ci [skip ci] --- build_cli.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/build_cli.sh b/build_cli.sh index 2081ff8..6998735 100755 --- a/build_cli.sh +++ b/build_cli.sh @@ -61,19 +61,24 @@ else if [[ "${VSCODE_ARCH}" == "arm64" ]]; then VSCODE_CLI_TARGET="aarch64-unknown-linux-gnu" - export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc - export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc - export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ - export PKG_CONFIG_ALLOW_CROSS=1 + if [[ "${CI_BUILD}" != "no" ]]; then + export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc + export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc + export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ + export PKG_CONFIG_ALLOW_CROSS=1 + fi elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then VSCODE_CLI_TARGET="armv7-unknown-linux-gnueabihf" export OPENSSL_LIB_DIR="$( pwd )/openssl/out/arm-linux/lib" export OPENSSL_INCLUDE_DIR="$( pwd )/openssl/out/arm-linux/include" - export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc - export CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc - export CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ - export PKG_CONFIG_ALLOW_CROSS=1 + + if [[ "${CI_BUILD}" != "no" ]]; then + export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc + export CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc + export CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ + export PKG_CONFIG_ALLOW_CROSS=1 + fi elif [[ "${VSCODE_ARCH}" == "x64" ]]; then VSCODE_CLI_TARGET="x86_64-unknown-linux-gnu" fi