diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0b3487..c8ca8b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,10 @@ workflow: - flatpak install -y --user flathub org.gnome.Platform//50 org.gnome.Sdk//50 - flatpak install -y --user flathub org.freedesktop.Sdk.Extension.llvm22//25.08 - flatpak install -y --user flathub org.freedesktop.Sdk.Extension.rust-stable//25.08 + - flatpak info org.gnome.Platform + - flatpak info org.gnome.Sdk + - flatpak info org.freedesktop.Sdk.Extension.llvm22 + - flatpak info org.freedesktop.Sdk.Extension.rust-stable - flatpak-builder --version build: diff --git a/build-aux/org.pipewire.Helvum.json b/build-aux/org.pipewire.Helvum.json index 1144ac4..e0f9df3 100644 --- a/build-aux/org.pipewire.Helvum.json +++ b/build-aux/org.pipewire.Helvum.json @@ -13,7 +13,8 @@ "--socket=wayland", "--device=dri", "--share=ipc", - "--filesystem=xdg-run/pipewire-0" + "--filesystem=xdg-run/pipewire-0", + "--filesystem=host" ], "build-options": { "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm22/bin", diff --git a/data/meson.build b/data/meson.build index 305c8f4..7c35ed5 100644 --- a/data/meson.build +++ b/data/meson.build @@ -11,10 +11,11 @@ desktop_file = configure_file( if desktop_file_validate.found() test( 'validate-desktop', - desktop_file_validate, + sh, args: [ - desktop_file - ], + '-c', + 'desktop-file-validate data/' + base_id + '.desktop' + ] ) endif @@ -36,10 +37,11 @@ appdata_file = configure_file( if appstream_util.found() test( 'validate-appdata', - appstream_util, + sh, args: [ - 'validate', '--nonet', appdata_file - ], + '-c', + 'appstream-util validate --nonet data/' + base_id + '.metainfo.xml' + ] ) endif diff --git a/meson.build b/meson.build index 0a726c7..83ab731 100644 --- a/meson.build +++ b/meson.build @@ -22,6 +22,7 @@ dependency('libpipewire-0.3', version: '>= 1.6.0') desktop_file_validate = find_program('desktop-file-validate', required: false) appstream_util = find_program('appstream-util', required: false) cargo = find_program('cargo', required: true) +sh = find_program('sh', required: true) prefix = get_option('prefix') bindir = prefix / get_option('bindir')