colin/gnome-calls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Use appstreamcli instead of appstream-util

Browse Source
This commit is contained in:
Evangelos Ribeiro Tzaras
2021-10-19 18:40:32 +02:00
parent f828f24591
commit db2bb818b6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@@ -28,7 +28,7 @@ build:native:
- export DEBIAN_FRONTEND=noninteractive - export DEBIAN_FRONTEND=noninteractive
- apt-get -y update - apt-get -y update
- apt-get -y install eatmydata - apt-get -y install eatmydata
- eatmydata apt-get -y install lcov ca-certificates appstream-util - eatmydata apt-get -y install lcov ca-certificates appstream
- '[ "${WANT_BUILD_DEPS}" != "true" ] || eatmydata apt-get -y build-dep .' - '[ "${WANT_BUILD_DEPS}" != "true" ] || eatmydata apt-get -y build-dep .'
- ulimit -c unlimited - ulimit -c unlimited
script: script:
@@ -75,7 +75,7 @@ check-po:
- cd po/ - cd po/
- intltool-update -m 2>&1 | grep -qs '/.*\.c' && { intltool-update -m; exit 1; } || exit 0 - intltool-update -m 2>&1 | grep -qs '/.*\.c' && { intltool-update -m; exit 1; } || exit 0
validate-metadata-strict: validate-metadata-pedantic:
stage: test stage: test
image: debian:bookworm image: debian:bookworm
allow_failure: true allow_failure: true
@@ -84,9 +84,9 @@ validate-metadata-strict:
- export DEBIAN_FRONTEND=noninteractive - export DEBIAN_FRONTEND=noninteractive
- apt-get -y update - apt-get -y update
- apt-get -y install eatmydata ca-certificates - apt-get -y install eatmydata ca-certificates
- eatmydata apt-get -y install appstream-util - eatmydata apt-get -y install appstream
script: script:
- appstream-util validate-strict data/org.gnome.Calls.metainfo.xml - appstreamcli validate --pedantic data/org.gnome.Calls.metainfo.xml
package-debian-bookworm: package-debian-bookworm:
tags: [] tags: []

8
data/meson.build
View File

@@ -37,10 +37,10 @@ install_data('org.gnome.Calls.metainfo.xml',
install_dir: join_paths(datadir, 'metainfo'), install_dir: join_paths(datadir, 'metainfo'),
) )
appstream_util = find_program('appstream-util', required: false) appstreamcli = find_program('appstreamcli', required: false)
if appstream_util.found() if appstreamcli.found()
test('Validate appstream file', appstream_util, test('Validate metainfo file', appstreamcli,
args: ['validate-relax', args: ['validate',
join_paths(meson.current_source_dir(), join_paths(meson.current_source_dir(),
'org.gnome.Calls.metainfo.xml') 'org.gnome.Calls.metainfo.xml')
]) ])