From f99be0b69f450d57db5ddf45201718d2fbbb2f00 Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Tue, 25 Apr 2023 16:05:12 +0200 Subject: [PATCH] Update CI recipe --- .build.yml | 23 ------------------ .builds/alpine-latest.yml | 50 +++++++++++++++++++++++++++++++++++++++ meson.build | 3 +-- meson_options.txt | 2 +- 4 files changed, 52 insertions(+), 26 deletions(-) delete mode 100644 .build.yml create mode 100644 .builds/alpine-latest.yml diff --git a/.build.yml b/.build.yml deleted file mode 100644 index 135daf3..0000000 --- a/.build.yml +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-FileCopyrightText: Hanspeter Portner -# SPDX-License-Identifier: CC0-1.0 - -image: alpine/latest -packages: - - reuse - - meson - - lv2-dev - - lilv-dev - - curl-dev - - elfutils-dev - - libx11-dev - - linux-headers -tasks: - - setup: | - cd lv2lint - meson setup build -Delf-tests=enabled -Donline-tests=enabled -Dx11-tests=enabled - - build: | - cd lv2lint - ninja -C build - - test: | - cd lv2lint - ninja -C build test diff --git a/.builds/alpine-latest.yml b/.builds/alpine-latest.yml new file mode 100644 index 0000000..e8d802e --- /dev/null +++ b/.builds/alpine-latest.yml @@ -0,0 +1,50 @@ +# SPDX-FileCopyrightText: Hanspeter Portner +# SPDX-License-Identifier: CC0-1.0 + +--- + +image: alpine/latest + +packages: + - reuse + - meson + - musl-dev + - lv2-dev + - lilv-dev + - curl-dev + - elfutils-dev + - libx11-dev + - linux-headers + +environment: + project: lv2lint + +tasks: + - setup: | + cd "${project}" + meson setup build \ + -Dbuildtype=release \ + -Dprefer_static=true \ + -Dprefix="/tmp/${project}" \ + -Delf-tests=enabled \ + -Donline-tests=enabled \ + -Dx11-tests=enabled + - build: | + cd "${project}" + ninja -C build install + - test: | + cd "${project}" + ninja -C build test + - pack: | + cd /tmp + tar -czf artifacts.tar.gz "${project}" + +artifacts: + - /tmp/artifacts.tar.gz + +triggers: + - action: email + condition: failure + to: "" + +... diff --git a/meson.build b/meson.build index cc76a3a..e099523 100644 --- a/meson.build +++ b/meson.build @@ -45,8 +45,7 @@ m_dep = cc.find_library('m') rt_dep = cc.find_library('rt') dl_dep = cc.find_library('dl') lv2_dep = dependency('lv2', version : '>=1.18.0') -lilv_dep = dependency('lilv-0', version : '>=0.24.0', - static : meson.is_cross_build() and false) #FIXME +lilv_dep = dependency('lilv-0', version : '>=0.24.0') curl_dep = dependency('libcurl', required: online_tests) elf_dep = dependency('libelf', required: elf_tests) x11_dep = dependency('x11', version : '>=1.6.0', required : x11_tests) diff --git a/meson_options.txt b/meson_options.txt index 441792d..e14edf5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,4 +4,4 @@ option('online-tests', type : 'feature', value : 'disabled') option('elf-tests', type : 'feature', value : 'disabled') option('x11-tests', type : 'feature', value : 'disabled') -option('version', type : 'string', value : '0.17.77') +option('version', type : 'string', value : '0.17.81') -- 2.38.5