From db2bb818b6a8c3e9cc1f9518ab87858292a2527c Mon Sep 17 00:00:00 2001
From: Evangelos Ribeiro Tzaras <devrtz@fortysixandtwo.eu>
Date: Tue, 19 Oct 2021 18:40:32 +0200
Subject: [PATCH] ci: Use appstreamcli instead of appstream-util

---
 .gitlab-ci.yml   | 8 ++++----
 data/meson.build | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87bea8e..02dcee6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ build:native:
     - export DEBIAN_FRONTEND=noninteractive
     - apt-get -y update
     - 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 .'
     - ulimit -c unlimited
   script:
@@ -75,7 +75,7 @@ check-po:
     - cd po/
     - intltool-update -m 2>&1 | grep -qs '/.*\.c' && { intltool-update -m; exit 1; } || exit 0
 
-validate-metadata-strict:
+validate-metadata-pedantic:
   stage: test
   image: debian:bookworm
   allow_failure: true
@@ -84,9 +84,9 @@ validate-metadata-strict:
     - export DEBIAN_FRONTEND=noninteractive
     - apt-get -y update
     - apt-get -y install eatmydata ca-certificates
-    - eatmydata apt-get -y install appstream-util
+    - eatmydata apt-get -y install appstream
   script:
-    - appstream-util validate-strict data/org.gnome.Calls.metainfo.xml
+    - appstreamcli validate --pedantic data/org.gnome.Calls.metainfo.xml
 
 package-debian-bookworm:
   tags: []
diff --git a/data/meson.build b/data/meson.build
index 9aef3cf..3b36db8 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -37,10 +37,10 @@ install_data('org.gnome.Calls.metainfo.xml',
     install_dir: join_paths(datadir, 'metainfo'),
 )
 
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test('Validate appstream file', appstream_util,
-       args: ['validate-relax',
+appstreamcli = find_program('appstreamcli', required: false)
+if appstreamcli.found()
+  test('Validate metainfo file', appstreamcli,
+       args: ['validate',
               join_paths(meson.current_source_dir(),
                          'org.gnome.Calls.metainfo.xml')
              ])