From d6866ff0f130704ff963d9e053b1d85407ed2d7c Mon Sep 17 00:00:00 2001 From: Kirill Isakov Date: Fri, 18 Mar 2022 01:26:20 +0600 Subject: [PATCH] sourcehut CI: change build system to meson --- .builds/freebsd.yml | 23 +++++------------------ .builds/netbsd.yml | 16 +++++----------- .builds/openbsd.yml | 20 ++++++-------------- 3 files changed, 16 insertions(+), 43 deletions(-) diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index a52803b2..5ecfd76d 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -2,7 +2,8 @@ image: freebsd/13.x packages: - coreutils - - autotools + - meson + - pkgconf - openssl - lzo2 - liblz4 @@ -12,11 +13,6 @@ packages: - texinfo - vde2 - libgcrypt - - llvm12 - - py38-pip - -environment: - CFLAGS: -I/usr/local/include -L/usr/local/lib sources: - https://github.com/gsliepen/tinc @@ -24,21 +20,12 @@ sources: tasks: - configure: | cd tinc - autoreconf -fsi - ./configure --enable-miniupnpc --enable-vde + meson setup build -Dpkg_config_path=/usr/local/lib/pkgconfig - build: | cd tinc - make -j$(sysctl -n hw.ncpu) + ninja -C build - test: | cd tinc - make check-recursive VERBOSE=1 - - - lint: | - mkdir -p ~/.local/bin - ln -f -s "$(which clang-tidy12)" ~/.local/bin/clang-tidy - pip install --user compiledb - cd tinc - export PATH=$PATH:$HOME/.local/bin - sh .ci/tidy/run.sh + meson test -C build --verbose diff --git a/.builds/netbsd.yml b/.builds/netbsd.yml index 1848df0d..bbeaf288 100644 --- a/.builds/netbsd.yml +++ b/.builds/netbsd.yml @@ -1,9 +1,8 @@ image: netbsd/9.x packages: - - gmake - - automake - - autoconf + - meson + - pkgconf - openssl - lzo - lz4 @@ -11,23 +10,18 @@ packages: - readline - gtexinfo -environment: - CFLAGS: -I/usr/pkg/include -L/usr/pkg/lib - sources: - https://github.com/gsliepen/tinc tasks: - configure: | cd tinc - autoreconf -fsi - ./configure --with-miniupnpc + meson setup build -Dpkg_config_path=/usr/pkg/lib/pkgconfig -Dminiupnpc=auto - build: | cd tinc - gmake -j$(sysctl -n hw.ncpu) + ninja -C build - test: | cd tinc - export LD_LIBRARY_PATH=/usr/pkg/lib - gmake check-recursive VERBOSE=1 + meson test -C build --verbose diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index 23ad669b..caf47998 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -1,34 +1,26 @@ -image: openbsd/6.9 +image: openbsd/7.0 packages: - - gmake - - automake-1.16.3 - - autoconf-2.71 - - openssl-1.1.1k + - meson + - pkgconf - lzo2 - lz4 - miniupnpc - readline - texinfo -environment: - AUTOCONF_VERSION: 2.71 - AUTOMAKE_VERSION: 1.16 - CFLAGS: -I/usr/local/include -L/usr/local/lib - sources: - https://github.com/gsliepen/tinc tasks: - configure: | cd tinc - autoreconf -fsi - ./configure --with-miniupnpc + meson setup build -Dminiupnpc=auto - build: | cd tinc - gmake -j$(sysctl -n hw.ncpu) + ninja -C build - test: | cd tinc - gmake check-recursive VERBOSE=1 + meson test -C build --verbose -- 2.20.1