ci: ensure dcc_new_temp_email is propagated

Closes #1344
This commit is contained in:
dignifiedquire
2020-03-19 11:14:37 +01:00
parent 10afdfecdd
commit 62b1b0519a
5 changed files with 7 additions and 3 deletions

View File

@@ -46,6 +46,7 @@ if [ -n "$TESTS" ]; then
tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "not qr" tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "not qr"
tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr" tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr"
unset DCC_PY_LIVECONFIG unset DCC_PY_LIVECONFIG
unset DCC_NEW_TMP_EMAIL
tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc
tox --workdir "$TOXWORKDIR" -e auditwheels tox --workdir "$TOXWORKDIR" -e auditwheels
popd popd

View File

@@ -32,11 +32,11 @@ ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE
set +x -e set +x -e
cd $BUILDDIR cd $BUILDDIR
export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
set -x set -x
# run everything else inside docker # run everything else inside docker
docker run -e DCC_PY_LIVECONFIG \ docker run -e DCC_NEW_TMP_EMAIL -e DCC_PY_LIVECONFIG \
--rm -it -v \$(pwd):/mnt -w /mnt \ --rm -it -v \$(pwd):/mnt -w /mnt \
deltachat/coredeps ci_scripts/run_all.sh deltachat/coredeps ci_scripts/run_all.sh

View File

@@ -30,6 +30,7 @@ ssh $SSHTARGET <<_HERE
export CARGO_TARGET_DIR=\`pwd\`/../target export CARGO_TARGET_DIR=\`pwd\`/../target
export TARGET=release export TARGET=release
export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
#we rely on tox/virtualenv being available in the host #we rely on tox/virtualenv being available in the host
#rm -rf virtualenv venv #rm -rf virtualenv venv

View File

@@ -38,6 +38,7 @@ mkdir -p $TOXWORKDIR
# Note that the independent remote_tests_python step does all kinds of # Note that the independent remote_tests_python step does all kinds of
# live-testing already. # live-testing already.
unset DCC_PY_LIVECONFIG unset DCC_PY_LIVECONFIG
unset DCC_NEW_TMP_EMAIL
tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels tox --workdir "$TOXWORKDIR" -e py35,py36,py37,py38,auditwheels
popd popd

View File

@@ -14,6 +14,7 @@ passenv =
DCC_RS_DEV DCC_RS_DEV
DCC_RS_TARGET DCC_RS_TARGET
DCC_PY_LIVECONFIG DCC_PY_LIVECONFIG
DCC_NEW_TMP_EMAIL
CARGO_TARGET_DIR CARGO_TARGET_DIR
RUSTC_WRAPPER RUSTC_WRAPPER
deps = deps =