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

composite/nighty: clear packages earlier if requested 

If we fail too early in non-flavoured build steps the package
progress is not reset so we do not get a rebuild later on even
though the nightly was missed...
This commit is contained in:
Franco Fichtner 2020-07-16 14:54:14 +02:00
parent ea8344b0b8
commit 45ce56fc95
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
composite/nightly.sh
View File

@ -55,22 +55,6 @@ if [ -f ${LOG}.err ]; then
STAGE1=
fi
for STAGE in ${STAGE1}; do
STAGENUM=$(expr ${STAGENUM} + 1)
LOG="${LOGSDIR}/${PRODUCT_VERSION}/$(printf %02d ${STAGENUM})-${STAGE}.log"
# we don't normally clean these stages
(time make ${STAGE} 2>&1 || touch ${LOG}.err) > ${LOG}
if [ -f ${LOG}.err ]; then
echo ">>> Stage ${STAGE} was aborted due to an error, last ${LINES} lines as follows:" > ${LOG}.err
tail -n ${LINES} ${LOG} >> ${LOG}.err
FLAVOUR=
break
fi
done
STAGENUM=$(expr ${STAGENUM} + 1)
for _FLAVOUR in ${FLAVOUR}; do
@ -92,6 +76,22 @@ for _FLAVOUR in ${FLAVOUR}; do
fi
done
for STAGE in ${STAGE1}; do
STAGENUM=$(expr ${STAGENUM} + 1)
LOG="${LOGSDIR}/${PRODUCT_VERSION}/$(printf %02d ${STAGENUM})-${STAGE}.log"
# we don't normally clean these stages
(time make ${STAGE} 2>&1 || touch ${LOG}.err) > ${LOG}
if [ -f ${LOG}.err ]; then
echo ">>> Stage ${STAGE} was aborted due to an error, last ${LINES} lines as follows:" > ${LOG}.err
tail -n ${LINES} ${LOG} >> ${LOG}.err
FLAVOUR=
break
fi
done
for STAGE in ${STAGE2}; do
STAGENUM=$(expr ${STAGENUM} + 1)