git: 75baf3765c68 - main - Cirrus-CI: set PKG_FORMAT via top level `env:`
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 01 May 2023 18:04:00 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=75baf3765c686547e8e4a5510858f45c23ccdec3
commit 75baf3765c686547e8e4a5510858f45c23ccdec3
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-05-01 16:45:36 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
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"