From 4a433ae4381a1b833e400ada2f5ccdab3b64f555 Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Fri, 21 Nov 2025 00:02:00 +0100 Subject: [PATCH] updated ci to use meson/ninja --- .woodpecker/build.yaml | 7 +++---- .woodpecker/release.yaml | 11 ++++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index c108c64..12b38c8 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -12,7 +12,6 @@ steps: image: alpine:latest commands: - apk update - - apk add --no-cache bash build-base words-en gdb perl autoconf automake pcre pcre-dev gdbm gdbm-dev pkgconfig - - ./autogen.sh - - ./configure - - make + - apk add --no-cache bash build-base words-en gdb perl pcre pcre-dev gdbm gdbm-dev pkgconfig meson ninja + - meson setup --reconfigure build + - ninja -C build diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 990eea8..8469c02 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -10,10 +10,11 @@ steps: image: alpine:latest commands: - apk update - - apk add --no-cache bash build-base - - make static - - file dicepwgen_static - - mv dicepwgen_static dicepwgen-linux-amd64 + - apk add --no-cache bash build-base words-en gdb perl pcre pcre-dev gdbm gdbm-dev pkgconfig meson ninja + - meson setup --reconfigure --prefer-static build + - ninja -C build + - file build/dbtool + - mv build/dbtool dbtool-linux-amd64 release: image: alpine:latest @@ -25,4 +26,4 @@ steps: commands: - apk update - apk add --no-cache bash httpie jq git - - .woodpecker/release.sh dicepwgen-linux-amd64 + - .woodpecker/release.sh dbtool-linux-amd64