Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-28 19:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

re-enable cross, some streamlining of docs

Browse Source
This commit is contained in:
holger krekel
2019-11-21 17:59:11 +01:00
parent 4ed96b16f4
commit e14c4d0683
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ci_scripts/run-rust-test.sh
View File

@@ -10,8 +10,7 @@ export OPT_RELEASE="--release ${OPT}"
export OPT_FFI_RELEASE="--manifest-path=deltachat-ffi/Cargo.toml --release"
# Select cargo command: use cross by default
# export CARGO_CMD=cross
export CARGO_CMD=cargo
export CARGO_CMD=cross
# On Appveyor (windows) and Travis (x86_64-unknown-linux-gnu and apple) native targets we use cargo (no need to cross-compile):
if [[ $TARGET = *"windows"* ]] || [[ $TARGET == "x86_64-unknown-linux-gnu" ]] || [[ $TARGET = *"apple"* ]]; then
@@ -19,9 +18,9 @@ if [[ $TARGET = *"windows"* ]] || [[ $TARGET == "x86_64-unknown-linux-gnu" ]] ||
fi
# Install cross if necessary:
#if [[ $CARGO_CMD == "cross" ]]; then
# cargo install --git https://github.com/dignifiedquire/cross --rev fix-tty --force
##fi
if [[ $CARGO_CMD == "cross" ]]; then
cargo install --git https://github.com/dignifiedquire/cross --rev fix-tty --force
fi
# Make sure TARGET is installed when using cargo:
if [[ $CARGO_CMD == "cargo" ]]; then