Merge pull request #223 from MightyCreak/update-cicd

feat(build): use appstreamcli to validate appdata

.github/workflows/ci.yml

@@ -16,8 +16,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
           python-version: '3.8'
 
@@ -40,11 +40,11 @@ jobs:
   meson-build-test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
           python-version: '3.8'
-    - run: sudo apt-get -y install meson appstream appstream-util desktop-file-utils gettext
+    - run: sudo apt-get -y install meson appstream desktop-file-utils gettext
     - run: pip install meson ninja
     - run: meson setup build
     - run: meson compile -C build
@@ -53,11 +53,11 @@ jobs:
   flatpak-build-test:
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-44
+      image: bilelmoussaoui/flatpak-github-actions:gnome-45
       options: --privileged
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
           python-version: '3.8'
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v6

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Update from GNOME 44 to 45 (@sabriunal)
 - Flatpak manifest now runs the tests (@sabriunal)
+- Use `appstreamcli` instead of the deprecated `appstream-util` to validate
+  appdata (@sabriunal)
 
 ### Removed
 
@@ -20,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fix compatibility with Python 3.12: remove use of `distutils` (@MightyCreak)
 - Fix new errors raised by Flake8 (@MightyCreak)
+- Fix the error with the CICD due to the use of `appstreamcli` (@MightyCreak)
 
 ## 0.8.2 - 2023-04-16
 

data/meson.build

@@ -33,10 +33,10 @@ if build_machine.system() == 'linux'
     install_dir: join_paths(get_option('datadir'), 'appdata')
   )
 
-  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 appstream file', appstreamcli,
-      args: ['validate', appstream_file]
+      args: ['validate', '--no-net', '--explain', appstream_file]
     )
   endif
 endif