From 75baf3765c686547e8e4a5510858f45c23ccdec3 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 1 May 2023 12:45:36 -0400
Subject: [PATCH] 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"