Skip to content

Commit

Permalink
Cirrus-CI: set PKG_FORMAT via top level env:
Browse files Browse the repository at this point in the history
This ensures consistency among different CI scripts, including future
ones for pkgbase work.

Sponsored by:	The FreeBSD Foundation
  • Loading branch information
emaste committed May 1, 2023
1 parent e11d11c commit 75baf37
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 75baf37

Please sign in to comment.