Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46: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

4
ci_scripts/run-python-test.sh
View File

@@ -23,10 +23,6 @@ rm -rf src/deltachat/__pycache__
export PYTHONDONTWRITEBYTECODE=1 export PYTHONDONTWRITEBYTECODE=1
# run python tests (tox invokes pytest to run tests in python/tests) # run python tests (tox invokes pytest to run tests in python/tests)
# we split out qr-tests run to minimize likelyness of flaky tests
# (some qr tests are pretty heavy in terms of send/received
# messages and async-imap's likely has concurrency problems,
# eg https://github.com/async-email/async-imap/issues/4 )
tox -e lint,py37 tox -e lint,py37
unset DCC_PY_LIVECONFIG unset DCC_PY_LIVECONFIG

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" export OPT_FFI_RELEASE="--manifest-path=deltachat-ffi/Cargo.toml --release"
# Select cargo command: use cross by default # Select cargo command: use cross by default
# export CARGO_CMD=cross export CARGO_CMD=cross
export CARGO_CMD=cargo
# On Appveyor (windows) and Travis (x86_64-unknown-linux-gnu and apple) native targets we use cargo (no need to cross-compile): # 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 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 fi
# Install cross if necessary: # Install cross if necessary:
#if [[ $CARGO_CMD == "cross" ]]; then if [[ $CARGO_CMD == "cross" ]]; then
# cargo install --git https://github.com/dignifiedquire/cross --rev fix-tty --force cargo install --git https://github.com/dignifiedquire/cross --rev fix-tty --force
##fi fi
# Make sure TARGET is installed when using cargo: # Make sure TARGET is installed when using cargo:
if [[ $CARGO_CMD == "cargo" ]]; then if [[ $CARGO_CMD == "cargo" ]]; then

3
python/tox.ini
View File

@@ -7,6 +7,9 @@ envlist =
[testenv] [testenv]
commands = commands =
# (some qr tests are pretty heavy in terms of send/received
# messages and async-imap's likely has concurrency problems,
# eg https://github.com/async-email/async-imap/issues/4 )
pytest -n6 -v -rsXx -k "not qr" {posargs:tests} pytest -n6 -v -rsXx -k "not qr" {posargs:tests}
pytest -n6 -v -rsXx -k "qr" {posargs:tests} pytest -n6 -v -rsXx -k "qr" {posargs:tests}
# python tests/package_wheels.py {toxworkdir}/wheelhouse # python tests/package_wheels.py {toxworkdir}/wheelhouse