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
This commit is contained in:
Ed Maste 2023-05-01 12:45:36 -04:00
parent e11d11c543
commit 75baf3765c

View File

@ -10,6 +10,9 @@ compute_engine_instance:
memory: 8G memory: 8G
disk: 40 disk: 40
env:
PKG_FORMAT: tar
task: task:
matrix: matrix:
- name: World and kernel amd64 build and boot smoke test - 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" - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN_PKG} WITHOUT_TOOLCHAIN=yes buildworld buildkernel"
package_script: 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: package_check_script:
- su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG" - su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG"