From b67203b421dcc8b260e8216b3832e06fd49e9084 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Thu, 21 Nov 2019 20:35:48 +0100 Subject: [PATCH] use the reponame in dir builddir to we can distinguish from desktop/android etc --- ci_scripts/remote_tests_python.sh | 5 ++--- ci_scripts/remote_tests_rust.sh | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh index 1ab22a807..b8e2a29b8 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/ci_scripts/remote_tests_python.sh @@ -1,13 +1,12 @@ #!/bin/bash export BRANCH=${CIRCLE_BRANCH:?branch to build} -export GITURL=${CIRCLE_REPOSITORY_URL:?git url of core-rust repo} - +export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name} export 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/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number} +export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number} set -e diff --git a/ci_scripts/remote_tests_rust.sh b/ci_scripts/remote_tests_rust.sh index b311440eb..edbe7977b 100755 --- a/ci_scripts/remote_tests_rust.sh +++ b/ci_scripts/remote_tests_rust.sh @@ -1,13 +1,12 @@ #!/bin/bash + export BRANCH=${CIRCLE_BRANCH:?branch to build} - -export GITURL=${CIRCLE_REPOSITORY_URL:?git url of core-rust repo} - +export REPONAME=${CIRCLE_PROJECT_REPONAME:?repository name} export 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/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number} +export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number} set -e