diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2023-05-01 16:45:36 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-05-04 13:16:24 +0000 |
| commit | 63c903e874da4d8d4a81cba9d7bdfecfe0169598 (patch) | |
| tree | 48c3428db69ed8201a63b698e0319092dd4eef8e /.cirrus.yml | |
| parent | f7398d2d0ab6b22d88296f7daff48ed3fe74aa56 (diff) | |
| download | src-63c903e874da4d8d4a81cba9d7bdfecfe0169598.tar.gz src-63c903e874da4d8d4a81cba9d7bdfecfe0169598.zip | |
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)
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 3 |
1 files changed, 2 insertions, 1 deletions
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: |