diff --git a/Jenkinsfile b/Jenkinsfile index b36279be98..0714b8ebcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -146,7 +146,7 @@ def build_channel(String channel_name) { return parallel ( "${channel_name} (git)": { deviceStage("build git", "tici-needs-can", [], [ - ["build ${channel_name}", "RELEASE=1 OPENPILOT_CHANNEL=${channel_name} $SOURCE_DIR/release/build_git_channel.sh"], + ["build ${channel_name}", "RELEASE=1 OPENPILOT_CHANNEL=${channel_name} BUILD_DIR=/data/openpilot_build $SOURCE_DIR/release/build_git_channel.sh"], ]) }, "${channel_name} (casync)": { diff --git a/release/build_casync_channel.sh b/release/build_casync_channel.sh index 87f70f5bfc..8b820fac89 100755 --- a/release/build_casync_channel.sh +++ b/release/build_casync_channel.sh @@ -4,9 +4,9 @@ set -ex DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" -export CASYNC_DIR="${CASYNC_DIR:=/tmp/casync}" -export SOURCE_DIR="$(git -C $DIR rev-parse --show-toplevel)" -export BUILD_DIR="${BUILD_DIR:=$(mktemp -d)}" +CASYNC_DIR="${CASYNC_DIR:=/tmp/casync}" +SOURCE_DIR="$(git -C $DIR rev-parse --show-toplevel)" +BUILD_DIR="${BUILD_DIR:=$(mktemp -d)}" echo "Creating casync channel from $SOURCE_DIR to $CASYNC_DIR" diff --git a/release/build_git_channel.sh b/release/build_git_channel.sh index 2b1dbb6a3a..a482e04eaf 100755 --- a/release/build_git_channel.sh +++ b/release/build_git_channel.sh @@ -6,8 +6,8 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" cd $DIR -BUILD_DIR=/data/openpilot -SOURCE_DIR="$(git rev-parse --show-toplevel)" +SOURCE_DIR="$(git -C $DIR rev-parse --show-toplevel)" +BUILD_DIR="${BUILD_DIR:=$(mktemp -d)}" # set git identity source $DIR/identity.sh