Merge pull request #8194 from bergzand/pr/murdock_cleanupvar

ci: murdock: Replace hardcoded path by bindir variable
This commit is contained in:
Cenk Gündoğan 2017-12-01 16:06:39 +01:00 committed by GitHub
commit 24476e0817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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
}