opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

composite/nighty: abort early, show which stage stopped

This commit is contained in:
Franco Fichtner 2019-11-19 13:32:32 +01:00
parent e6f8136251
commit 9d2c7feba3
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
composite/nightly.sh
View File

@ -45,7 +45,13 @@ mkdir -p ${LOGSDIR}/${PRODUCT_VERSION}
for STAGE in update info base kernel xtools distfiles; do
LOG=${LOGSDIR}/${PRODUCT_VERSION}/${STAGE}.log
# we don't normally clean these stages
(time make ${STAGE} 2>&1) > ${LOG}
(time make ${STAGE} 2>&1 || touch ${LOG}.err) > ${LOG}
if [ -f ${LOG}.err ]; then
echo ">>> Stage ${STAGE} was aborted due to an error" > ${LOG}.err
FLAVOUR=
break
fi
done
for _FLAVOUR in ${FLAVOUR}; do
@ -55,11 +61,28 @@ done
for STAGE in ports plugins core test; do
for _FLAVOUR in ${FLAVOUR}; do
LOG=${LOGSDIR}/${PRODUCT_VERSION}/${STAGE}-${_FLAVOUR}.log
((time make ${STAGE}-nightly FLAVOUR=${_FLAVOUR} 2>&1) > ${LOG}; \
((time make ${STAGE}-nightly FLAVOUR=${_FLAVOUR} 2>&1 || touch ${LOG}.err) > ${LOG}; \
tail -n 1000 ${LOG} > ${LOG}.tail) &
done
wait
for _FLAVOUR in ${FLAVOUR}; do
LOG=${LOGSDIR}/${PRODUCT_VERSION}/${STAGE}-${_FLAVOUR}.log
if [ -f ${LOG}.err ]; then
echo ">>> Stage ${STAGE}-${_FLAVOUR} was aborted due to an error" > ${LOG}.err
___FLAVOUR=
for __FLAVOUR in ${FLAVOUR}; do
if [ ${__FLAVOUR} != ${_FLAVOUR} ]; then
___FLAVOUR="${___FLAVOUR} ${__FLAVOUR}"
fi
done
FLAVOUR=${___FLAVOUR}
fi
done
done
tar -C ${TARGETDIRPREFIX} -cJf \