From nobody Fri Jun 20 06:30:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bNnfQ5H4Sz5ybWk; Fri, 20 Jun 2025 06:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bNnfQ4DRXz43kN; Fri, 20 Jun 2025 06:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750401038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwUsbeEr0cW+bAM0MttbJRoTpwEUu1iZ4Xmme8Kz+dM=; b=u9u6vDf+Daauw4qeht0JJPPsc5fpeWIpXYkJ1ul426vMTng/3fv5y3kUiEyyRKAZQwx1Nt 5dRQy8XI4vjP57LReFdlPnaVEvd7xl5jKosqJxefuwoNXhcZcBzDuYEjJCf952MWBDxJ4l Q5PekQRegxIpAp/4/RiYuift26GCBut5e4TNI5Efr0/yrsVPEoDeiXrUbbXd/PZX++4EJ2 96uXdtIxfD1yJb7AfMMsoS9ifVm/1e0owIuLFI6CqMMRBt3ztu4ixZtHUQB6+jCx9NbYOA cAAd/7WulECH+FIfgmP6DqzRvj6J/XNqT0MxOOi2JYbOUAJEk8xBFwCybc+x7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750401038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwUsbeEr0cW+bAM0MttbJRoTpwEUu1iZ4Xmme8Kz+dM=; b=NC3IfLv029KHKdbBrKFTInCic656kbjCaQ2PWWgrqgavwBod7Zqf86jUVpsJxxha4U9Afc ymI6O/vsvgNRK409aQbu9IfDMP9PX4ZiiWBHjzj2fUzswvzdCYH3INNEluvEaxQViOTcyf 0SITNMBH247yCGOWJGBNRqKo+XpoNoXgsgwYH2cHn8+9Jy3q++tv2F95uEr4meIyfWVhMS bkmnEwAdmnPjzZIR5pJvqFNgUiJYoHl5YnWz13WPxRPDK1UhBQIp0B6UO2fjre/M7gp9VG jrhpjTTY6qZfns+U3JNEN8o3TiYeQKchWn+5ykEVAyrqUx9omBzxFsrbydW8Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750401038; a=rsa-sha256; cv=none; b=IDI79XuyxVVJrEVLm5aiElTM4lpZuqP85a4RiWxdE2hin6gj3gwC+VB+l+G93rJzij5E8L 0d7AK83GK5Qaei3MnE92h+E5NI3fuYPKFD82tBgAVI6/WOCx2jycLBdDpP5im/aLBKRmEq SCrBBe7o1EU9pcwuPor0JlC5AI7dTf1GXdBObMrK5NOE0LYAuHXoDVgus6GL+SDT2naJsV dX+C8qXGurAbNOqDb2g/AnHutGPLZDb02meR/vo4vAG4q1ekYy4mNP//QvSgv5X3Bxyd8T Qbo5pFC2/ljxQQ3adAt8k0GkfFhEXWkWcU4o0xi7xWM6oKd1MIQSsDa4buiUbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bNnfQ3qpCzYxH; Fri, 20 Jun 2025 06:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55K6UcGY021519; Fri, 20 Jun 2025 06:30:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55K6Uc4i021516; Fri, 20 Jun 2025 06:30:38 GMT (envelope-from git) Date: Fri, 20 Jun 2025 06:30:38 GMT Message-Id: <202506200630.55K6Uc4i021516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 609720ed97b8 - main - release: Don't fail if one VM image fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 609720ed97b8de90ed2e9c8db6ea520076b76f11 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=609720ed97b8de90ed2e9c8db6ea520076b76f11 commit 609720ed97b8de90ed2e9c8db6ea520076b76f11 Author: Colin Percival AuthorDate: 2025-06-20 06:27:11 +0000 Commit: Colin Percival 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