From nobody Thu May 04 16:45:03 2023 X-Original-To: dev-commits-src-branches@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 4QC06R6JQWz49HqX; Thu, 4 May 2023 16:45:03 +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 4QC06R5bkjz401M; Thu, 4 May 2023 16:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683218703; 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=PI13f4jpq3HveFkhIXkNJtTuOUwQd2vXgxsOrNvPgZg=; b=ZFtLQKj7V6MT9Qpvie+CQL6SXEo7xYmhqPTrZjjK3sLbAsQrmN0avaQQTmQllDrHhEMj4S M251V+qeiUB+g9hIE2NC3CkOwQ28WFMRDBNberYXNdU1oMMLL4rscyss0o9kPTqaNJlx6j K9dh6C7QOjKgtN/e5ybbPs/CWfaLhZi6iSSJo1o8DpjcDtOewJ/vj2Oa8RByvs16KBPVGM QIhmR/GxZaRDIFzjuTjctzqphP5oBtLRZ2bqu2R+JsSOFjsj93lrjqn0hjcf1Njk9TIixO A3IDLnuzPxsnK3EKHoeHwBIQN3ZXgMuxXRog+laM+Uh2G7SRALiwq3Fj2STpgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683218703; 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=PI13f4jpq3HveFkhIXkNJtTuOUwQd2vXgxsOrNvPgZg=; b=r5j/VDRb3SaEeL+YgGsSbv8JF1bBxU4AOkQesEQ+fkpwJQ3PoJ/FB68cEmy84W0wx7rJ2X 9MBI2VeHMvLg9coRzZrC4AaODZ7ua1xVRdTEi/gQQKuocIv7xNICY7fsUEhDHmJqBTwl1d tzJCzJ5/ZyvltNneVKvaqS1cSkdAnCosUm+eLJie+g03EZrq5WWuMG153UXMwDXwk6BhAr kKzEzmTYM1Q44l2OHSzAugACJn5wCZd2KG0jKAZVvBQ47ZuYzLwZUT8L1J1Rag9vpYRmUv u82yfOKjv0XGwsSPvNDtUZB+onZLce1J0Ihs4KaH4OrNzAxwNSQ0a3/lz32SQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683218703; a=rsa-sha256; cv=none; b=CS9oCeNwam0onRQA6EV7j66s+ZPCArfAknFGOGBYuRjcCHEJoRWTw4P9AaZ9EuYCtwSgCx lsRNWBaq316Ifrf0RZ4Yo5ZLk2iULAKEEcLyep9fzFKDtBrCvLqepT10D/cqTQUJLbirAa Vm9yi3BnMLv8wFWeb5jaPQdta4J9ms7xFHyXnbyn3C0UbrdLvBu9PuPnnScUpKQ0ldfe4m uOeCNTmBXD/c/IppCQXtmODdIB6YoNPoxlMtQzXCOc46ziFwvA0SlFMDCDexlcLN6AG7rA /D9HRsupIt0j1dkvtkEEq/1U/bbm6epchQ5Sd1VXSPzivZf+6iBU5HU9PNiixg== 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 4QC06R4gLXzKR4; Thu, 4 May 2023 16:45:03 +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 344Gj32l067955; Thu, 4 May 2023 16:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 344Gj3sT067954; Thu, 4 May 2023 16:45:03 GMT (envelope-from git) Date: Thu, 4 May 2023 16:45:03 GMT Message-Id: <202305041645.344Gj3sT067954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 63c903e874da - stable/13 - Cirrus-CI: set PKG_FORMAT via top level `env:` List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 63c903e874da4d8d4a81cba9d7bdfecfe0169598 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=63c903e874da4d8d4a81cba9d7bdfecfe0169598 commit 63c903e874da4d8d4a81cba9d7bdfecfe0169598 Author: Ed Maste AuthorDate: 2023-05-01 16:45:36 +0000 Commit: Ed Maste CommitDate: 2023-05-04 13:16:24 +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 (cherry picked from commit 75baf3765c686547e8e4a5510858f45c23ccdec3) --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 88d232403ed1..81f049d7db46 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,6 +12,7 @@ compute_engine_instance: env: CIRRUS_CLONE_DEPTH: 1 + PKG_FORMAT: tar task: matrix: @@ -46,7 +47,7 @@ task: script: - 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" test_script: