From 01120dfc4630b9233194cd1423735f8bbb370d60 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sun, 6 Dec 2020 11:57:40 -0600 Subject: [PATCH] Try and fix openbsd st.ht build. Oneline meson configs, remove extra `cd janet`. --- .builds/openbsd.yml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index 1ee5033c..82565c91 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -6,42 +6,25 @@ packages: - meson tasks: - build: | - # Makefile testing on BSD. - cd janet + cd janet # Makefile testing on BSD. gmake gmake test doas gmake install gmake test-install doas gmake uninstall rm -rf build # clean up - # meson min testing - meson setup build --buildtype=release + meson setup build --buildtype=release -Dsingle_threaded=true -Dnanbox=false -Ddynamic_modules=false -Ddocstrings=false -Dnet=false -Dsourcemaps=false -Dpeg=false -Dassembler=false -Dint_types=false -Dtyped_array=false -Dreduced_os=true # meson minimum build cd build - meson configure -Dsingle_threaded=true - meson configure -Dnanbox=false - meson configure -Ddynamic_modules=false - meson configure -Ddocstrings=false - meson configure -Dnet=false - meson configure -Dsourcemaps=false - meson configure -Dpeg=false - meson configure -Dassembler=false - meson configure -Dint_types=false - meson configure -Dtyped_array=false - meson configure -Dreduced_os=true ninja # will not pass tests but should build cd .. rm -rf build # clean up - # meson (with prf) - meson setup build --buildtype=release + meson setup build --buildtype=release -Dprf=true # meson (with prf) cd build - meson configure -Dprf=true ninja ninja test cd .. rm -rf build - # meson (default build) - cd janet - meson setup build --buildtype=release + meson setup build --buildtype=release # meson (default build) cd build ninja ninja test