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