From 1a83c206507aaf9a7eed12c07435eabfc8bc7089 Mon Sep 17 00:00:00 2001
From: Koen Zandberg <koen@bergzand.net>
Date: Fri, 1 Dec 2017 12:11:27 +0100
Subject: [PATCH] ci: murdock: Replace hardcoded path by bindir var
---
.murdock | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/.murdock b/.murdock
index 89644b7ef5..3fd0bd4a54 100755
--- a/.murdock
+++ b/.murdock
@@ -73,10 +73,12 @@ compile() {
[ "$board" = "makefile_broken" ] && error "$0: Makefile in \"$appdir\" seems to be broken!"
# set build directory. CI ensures only one build at a time in $(pwd).
- rm -rf build
export BINDIR="$(pwd)/build"
export PKGDIRBASE="${BINDIR}/pkg"
+ # Pre-build cleanup
+ rm -rf ${BINDIR}
+
[ -n "$DWQ_WORKER" ] && \
echo "-- running on worker ${DWQ_WORKER} thread ${DWQ_WORKER_THREAD}, build number $DWQ_WORKER_BUILDNUM."
@@ -96,10 +98,13 @@ compile() {
fi
fi
- test -d ${BINDIR} && echo "-- build directory size: $(du -sh ${BINDIR} | cut -f1)"
+ if [ -d ${BINDIR} ]
+ then
+ echo "-- build directory size: $(du -sh ${BINDIR} | cut -f1)"
- # cleanup
- rm -Rf build
+ # cleanup
+ rm -rf ${BINDIR}
+ fi
return $RES
}
--
GitLab