From nobody Mon May 01 18:04:00 2023 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 4Q9B0w6tzhz48pq1; Mon, 1 May 2023 18:04:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q9B0w6DY7z47rv; Mon, 1 May 2023 18:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682964240; 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=nA0+yaR2bH6M5iXNhua5h+BIUmgTE++3RyyC95aHzQQ=; b=x5+fN39UjN1sgzVM15mRefw8FTnBU/glljaOfu5WX5zBPXC1UWMbbC/auNQy4w2r5MXQex 7Uf5iZYghBsGWfXxHIxlqak/TXN2kDMQWFekQFvCq/WY0Mr7yclK0LqG7utMUqCKHYRDmA CTK5viKwaybEoIEnXReRtezWQqgU3npq8+zKbLaidc0sAw4rHmDrtyZ4OPXqc2qbnn7aqa JXDfig5RcLa9F3sDdHK3qhmS08/duV3q+/H6YZ9ie+ioTdv0rg7hjmG4NemsNOjPMHqCg/ WvzbTWE2lTlARy5PsHrzu9KAtrEOYpavWiD7tdmBM4E1/vY/MKwcCpucb3mg5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682964240; 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=nA0+yaR2bH6M5iXNhua5h+BIUmgTE++3RyyC95aHzQQ=; b=O6Rh+Aus0iixmHvVbjTmlv8vlccX5FO8PrUHg10ftGzGTqiVTqvf4bnK6jTbdZc2T7vv9R k2f7lWEcLAPLm/CiD1hFT6otqglyZw/wOiJ9wkYeUDmIxZhbCCNmZX2q+M5yimliL574MC 6f/ait3OUcKeGmrMRN4TUdg5a7ppPa8m5873JIpGhoWLJtMCIsVjQk64S3HC6NgwyKmFTl QrW6nDAzR9uX+YrLNbEooa/7v4U3yzHVc+v028BXynWU6b50RjLsg+42q9unZtSlK5ES5E DbZGYRUrFpBhpsIF/oNa4vTzs+PJtfNiU7duU8ck+nzHKROMcHPsxetN6YSt7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682964240; a=rsa-sha256; cv=none; b=a6My7gW/k363IekNPayGkv0aIfE1RtT7XauNqKmr5RY9AhQ84AZ7nv/WF21RoYy19fIUDd sBowQ669ZMPowRbMjJLvtFIa0ks5Q44jH8HFHObwQ2KKC+otwzvctEYE3AlnFpJpwj4Xhy Rqq5iXWzcPSitYNUMVnFfMg/xaHVLUFZSP94BmkYgtoDhMtbQMLhZ5EVnRPTANVmqNWIrT aCVpXE2QegtoJu1kGzEnq+aTeoJ6OQ2PW3LSZT/VehYyhipXJqEw7CeDLN/ffPAMtU74M4 JbM56fWQU3lyKJU8yIzXB00fi4xQ4pGmDqMD0O9Y2LXWpK5uyxgwhEDssN7ZgQ== 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 4Q9B0w5GwMzFyY; Mon, 1 May 2023 18:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 341I409h054187; Mon, 1 May 2023 18:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341I40xr054186; Mon, 1 May 2023 18:04:00 GMT (envelope-from git) Date: Mon, 1 May 2023 18:04:00 GMT Message-Id: <202305011804.341I40xr054186@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 75baf3765c68 - main - Cirrus-CI: set PKG_FORMAT via top level `env:` 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75baf3765c686547e8e4a5510858f45c23ccdec3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=75baf3765c686547e8e4a5510858f45c23ccdec3 commit 75baf3765c686547e8e4a5510858f45c23ccdec3 Author: Ed Maste AuthorDate: 2023-05-01 16:45:36 +0000 Commit: Ed Maste CommitDate: 2023-05-01 18:03:32 +0000 Cirrus-CI: set PKG_FORMAT via top level `env:` This ensures consistency among different CI scripts, including future ones for pkgbase work. Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f2c8fa83c59f..f560e9476bc8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,6 +10,9 @@ compute_engine_instance: memory: 8G disk: 40 +env: + PKG_FORMAT: tar + task: matrix: - name: World and kernel amd64 build and boot smoke test @@ -46,7 +49,7 @@ task: - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN_PKG} WITHOUT_TOOLCHAIN=yes buildworld buildkernel" package_script: - - su user -c "make CROSS_TOOLCHAIN=${TOOLCHAIN_PKG} WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages" + - su user -c "make CROSS_TOOLCHAIN=${TOOLCHAIN_PKG} WITHOUT_TOOLCHAIN=yes packages" package_check_script: - su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG"