Date: Fri, 20 Jun 2025 06:30:38 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 609720ed97b8 - main - release: Don't fail if one VM image fails Message-ID: <202506200630.55K6Uc4i021516@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=609720ed97b8de90ed2e9c8db6ea520076b76f11 commit 609720ed97b8de90ed2e9c8db6ea520076b76f11 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2025-06-20 06:27:11 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2025-06-20 06:30:30 +0000 release: Don't fail if one VM image fails Replace "mk-vmimage.sh" with "mk-vmimage.sh || true" so that a single VM image failing doesn't result in the entire release build dying. Fixes: 611c1457ff32 ("release: Add set -e to abort upon failure") --- release/Makefile.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index ff8adcb8bd9b..975a8e970ade 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -143,7 +143,7 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \ -F ${"${_CW:MEC2-BUILDER}" != "":?ufs:${_FS}} \ -i ${.OBJDIR}/${_CW:tl}.${_FS}.${_FMT}.img -s ${VMSIZE} -f ${_FMT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE} -c ${${_CW:tu}CONF} + -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE} -c ${${_CW:tu}CONF} || true touch ${.TARGET} . endfor . endfor @@ -196,7 +196,7 @@ vm-image: ${QEMUTGT} -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} + -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} || true . endfor . endfor .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506200630.55K6Uc4i021516>