From nobody Wed May 7 20:25:26 2025 X-Original-To: dev-commits-src-all@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 4Zt6Fy2jGGz5vF0T; Wed, 07 May 2025 20:25:26 +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 4Zt6Fy1schz401T; Wed, 07 May 2025 20:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746649526; 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=CKz72E9KTEoUKobsi2i00cG1dFKd2ydTK61fw+L80aM=; b=wTNrJ9pBsNh7iTwX58vjgITZgdB2Uw87a33byMTKG0IbK+S4iczizEMgwOSrUaGdH+7+N3 +KB2fHBpPClNcyaN6fNw8RxUMlMSad42U3uSM3iGAhEuBrklZ8sfbWQczE0iIDU9JWjgJ5 O0X/1+H7fTyZYxDNk7inJU20XMX4bk2nAUo++9nn8JYT9EeWqS74bgLzR5cin5oUhklxAR f6kP9e2lqQzrb1QzboKTvkfuMfJkzd63qRU8+9UqAt6wF5WUNhizlo3iJaBQHfGstLwsbM BZ6RYoAmUpGSRm+XhNNrwazZ4kJwruzsHwZPo8LF20qSHPHoTtR32L9GMI8Ozw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746649526; 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=CKz72E9KTEoUKobsi2i00cG1dFKd2ydTK61fw+L80aM=; b=VCPGHHbYbHmqBK3/nb6/61PIw2gXgr7RGfqA8gLkZpQUw+V5McNtcl8pBlUm7oeTHI0mBH bHI29IGQzugIib68y1RWlYR0yvei7D/21QDFnYpkCUGrCnOsAO0cfdqWzUV2cvxEvrmeGG f+9IctfJBK+i8yy+sYC7nzV/69hZD53RSnuorMGPlYm0KKKeSLLG+GXjzsR7KCizgT9XSe Tx1a5eM+VMj6osnTDdzb9AEs/qeWKIySeZMth5fD4AreDYZiEmPQw991VjDjr+weJw1yCr v/yWmecMSprOCylnF11FjOL9qQn+1T261ttPKdbhfhNE/Sv8mwuvIsAZ0KEK9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746649526; a=rsa-sha256; cv=none; b=QPEUC2LQ6I99munTlLYDgEB/zj5tkg/aSOzrQKI18eMrnqkI9Jgx84ToILLEFRRr908XXQ xEYCnUoVB57Oka58KWwpCPArogUJar+4SiEVkM/i1y7G3RuSDOSUSvjKhiWeS+ObC0VD1m Dsw39XghLcTL7SI0X04p1W/TCEFvPZFNG9YHppfK+i3IM5teo4aTm7kFOU+4Tj9m4MMoYM sNW8C3an+voeSBgo/thvOTcjnQGaoeNgLWvDX/ep3mvqI4oclS6og4vhLCddpg+606vvCB YzY6FXhgVp1XKGK8WrrmUI5ULR0tTc50H2AlMSr6UEUjb5PcrdR7pHqPXT7HrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zt6Fy1CP4zlKh; Wed, 07 May 2025 20:25:26 +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 547KPQrO059928; Wed, 7 May 2025 20:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547KPQsD059925; Wed, 7 May 2025 20:25:26 GMT (envelope-from git) Date: Wed, 7 May 2025 20:25:26 GMT Message-Id: <202505072025.547KPQsD059925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 4b656ded9248 - main - Refactor pre-commit CI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b656ded9248840ebc7afb8aba2384c8b0a2afb3 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=4b656ded9248840ebc7afb8aba2384c8b0a2afb3 commit 4b656ded9248840ebc7afb8aba2384c8b0a2afb3 Author: Muhammad Moinur Rahman AuthorDate: 2025-05-07 20:23:57 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-05-07 20:25:18 +0000 Refactor pre-commit CI Currently our test mechanism is not fit for building without cross-toolchain as we are not allowing EXTRA_MAKE_FLAGS. Also we are not allowing to build and test other KERNCONF. So allow these variables to be overridden in command line. Approved by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50220 --- tests/ci/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/ci/Makefile b/tests/ci/Makefile index e51c97fa2b83..e6464e8392e6 100644 --- a/tests/ci/Makefile +++ b/tests/ci/Makefile @@ -27,6 +27,7 @@ PARALLEL_JOBS!=sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null TOTAL_MEMORY!=expr ${_MEMORY} / 1073741824 KERNCONF?= GENERIC LOCALBASE?= /usr/local +EXTRA_MAKE_FLAGS?= .if !defined(TARGET) || empty(TARGET) TARGET= ${MACHINE} @@ -167,15 +168,16 @@ ci-buildworld: .PHONY @echo "Building world for ${TARGET_ARCH}" ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \ ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \ - buildworld > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ + ${EXTRA_MAKE_FLAGS} buildworld > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ (echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false) ci-buildkernel: ci-buildworld-${TARGET_ARCH:tl} .PHONY @echo "Building kernel for ${TARGET_ARCH"}" ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \ - ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} \ - SRCCONF=${SRCCONF} buildkernel > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ + ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} + ${EXTRA_MAKE_FLAGS} KERNCONF=${KERNCONF} \ + buildkernel > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \ (echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false) ci-buildimage: ${QEMUTGT} ci-buildkernel-${TARGET_ARCH:tl} .PHONY