Merge pull request #8194 from bergzand/pr/murdock_cleanupvar
ci: murdock: Replace hardcoded path by bindir variable
This commit is contained in:
commit
24476e0817
13
.murdock
13
.murdock
@ -73,10 +73,12 @@ compile() {
|
|||||||
[ "$board" = "makefile_broken" ] && error "$0: Makefile in \"$appdir\" seems to be broken!"
|
[ "$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).
|
# set build directory. CI ensures only one build at a time in $(pwd).
|
||||||
rm -rf build
|
|
||||||
export BINDIR="$(pwd)/build"
|
export BINDIR="$(pwd)/build"
|
||||||
export PKGDIRBASE="${BINDIR}/pkg"
|
export PKGDIRBASE="${BINDIR}/pkg"
|
||||||
|
|
||||||
|
# Pre-build cleanup
|
||||||
|
rm -rf ${BINDIR}
|
||||||
|
|
||||||
[ -n "$DWQ_WORKER" ] && \
|
[ -n "$DWQ_WORKER" ] && \
|
||||||
echo "-- running on worker ${DWQ_WORKER} thread ${DWQ_WORKER_THREAD}, build number $DWQ_WORKER_BUILDNUM."
|
echo "-- running on worker ${DWQ_WORKER} thread ${DWQ_WORKER_THREAD}, build number $DWQ_WORKER_BUILDNUM."
|
||||||
|
|
||||||
@ -96,10 +98,13 @@ compile() {
|
|||||||
fi
|
fi
|
||||||
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
|
# cleanup
|
||||||
rm -Rf build
|
rm -rf ${BINDIR}
|
||||||
|
fi
|
||||||
|
|
||||||
return $RES
|
return $RES
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user