From 7d550dbeeb039d43621be632e48fd5e12160289c Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 30 Jan 2017 16:59:18 +0100
Subject: [PATCH] CI: murdock: misc changes
---
.murdock | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/.murdock b/.murdock
index 171b742160..b911db8bea 100755
--- a/.murdock
+++ b/.murdock
@@ -4,6 +4,11 @@ export RIOT_CI_BUILD=1
export STATIC_TESTS=${STATIC_TESTS:-1}
export CFLAGS_DBG=""
+error() {
+ echo "$@"
+ exit 1
+}
+
_greplist() {
if [ $# -eq 0 ]; then
echo cat
@@ -66,8 +71,16 @@ compile() {
local appdir=$1
local board=$2
+ [ -n "$DWQ_WORKER" ] && \
+ echo "$0: compile: running on worker $DWQ_WORKER, build number $DWQ_WORKER_BUILDNUM."
+
check_workdir
+ # sanity checks
+ [ $# -ne 2 ] && error "$0: compile: invalid parameters (expected \$appdir \$board)"
+ [ ! -d "$appdir" ] && error "$0: compile: error: application directory \"$appdir\" doesn't exist"
+ [ ! -d "boards/$board" ] && error "$0: compile: error: board directory \"boards/$board\" doesn't exist"
+
CCACHE_BASEDIR="$(pwd)" BOARD=$board RIOT_CI_BUILD=1 \
make -C${appdir} clean all -j${JOBS:-4}
RES=$?
@@ -79,7 +92,8 @@ compile() {
fi
fi
- BOARD=$board make --no-print-directory -C${appdir} clean clean-intermediates
+ # cleanup
+ rm -Rf "${appdir}/bin/${board}" "${appdir}/bin/pkg/${board}"
check_workdir
--
GitLab