From ffa2e060431ef329d8a00397a7f10dd363f2b372 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 30 Dec 2021 18:37:19 -0600 Subject: use meson in cirrus ci --- .cirrus.yml | 2 +- ci/cirrus.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3df706f8..81cc7554 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,6 +11,6 @@ test_task: OS: FreeBSD procfs_script: > [ -f /proc/curproc ] || mount -t procfs proc /proc - pkg_install_script: pkg install -y bash gawk gmake gsed + pkg_install_script: pkg install -y bash gawk gsed meson gsed_hack_script: rm /usr/bin/sed && ln -s /usr/local/bin/gsed /usr/bin/sed test_script: bash ci/cirrus.sh diff --git a/ci/cirrus.sh b/ci/cirrus.sh index e013623f..20adc9b7 100755 --- a/ci/cirrus.sh +++ b/ci/cirrus.sh @@ -16,6 +16,6 @@ set -x # These are steps to run on Cirrus CI under a jailed FreeBSD system. # See $TOP/.cirrus.yml for more info about the Cirrus CI setup. -cpus=$(getconf NPROCESSORS_CONF || echo 1) -gmake -j"${cpus}" -O -gmake test +meson build +meson compile -C build +# gmake test -- cgit v1.2.3