From a26c43e9fd3bcb6645cdd72280fced84475c97b9 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 18 Sep 2020 23:29:17 +0200 Subject: [PATCH] use per build-job CARGO_TARGET_DIR --- ci_scripts/remote_python_packaging.sh | 2 -- ci_scripts/remote_tests_python.sh | 5 ----- ci_scripts/remote_tests_rust.sh | 5 ----- 3 files changed, 12 deletions(-) diff --git a/ci_scripts/remote_python_packaging.sh b/ci_scripts/remote_python_packaging.sh index ec386ab20..c983a072a 100755 --- a/ci_scripts/remote_python_packaging.sh +++ b/ci_scripts/remote_python_packaging.sh @@ -4,8 +4,6 @@ export BRANCH=${CIRCLE_BRANCH:?branch to build} export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name} export SSHTARGET=${SSHTARGET-ci@b1.delta.chat} -# we construct the BUILDDIR such that we can easily share the -# CARGO_TARGET_DIR between runs ("..") export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number} echo "--- Copying files to $SSHTARGET:$BUILDDIR" diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh index b320db0d1..126e9de6d 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/ci_scripts/remote_tests_python.sh @@ -4,8 +4,6 @@ export BRANCH=${CIRCLE_BRANCH:?branch to build} export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name} export SSHTARGET=${SSHTARGET-ci@b1.delta.chat} -# we construct the BUILDDIR such that we can easily share the -# CARGO_TARGET_DIR between runs ("..") export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number} echo "--- Copying files to $SSHTARGET:$BUILDDIR" @@ -30,9 +28,6 @@ ssh $SSHTARGET <<_HERE export RUSTC_WRAPPER=\`which sccache\` cd $BUILDDIR - # let's share the target dir with our last run on this branch/job-type - # cargo will make sure to block/unblock us properly - export CARGO_TARGET_DIR=\`pwd\`/../target-python export TARGET=release export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL diff --git a/ci_scripts/remote_tests_rust.sh b/ci_scripts/remote_tests_rust.sh index 3eefdf20c..58b6138e2 100755 --- a/ci_scripts/remote_tests_rust.sh +++ b/ci_scripts/remote_tests_rust.sh @@ -4,8 +4,6 @@ export BRANCH=${CIRCLE_BRANCH:?branch to build} export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name} export SSHTARGET=${SSHTARGET-ci@b1.delta.chat} -# we construct the BUILDDIR such that we can easily share the -# CARGO_TARGET_DIR between runs ("..") export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number} set -e @@ -24,9 +22,6 @@ ssh $SSHTARGET <<_HERE shopt -s huponexit export RUSTC_WRAPPER=\`which sccache\` cd $BUILDDIR - # let's share the target dir with our last run on this branch/job-type - # cargo will make sure to block/unblock us properly - export CARGO_TARGET_DIR=\`pwd\`/../target-rust export TARGET=x86_64-unknown-linux-gnu export RUSTC_WRAPPER=sccache