From 62a82aed0812b8518bb16bd3a4474ad4b15362d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Sun, 7 Jan 2024 02:48:26 +0300 Subject: [PATCH 1/4] feat(build): use appstreamcli to validate appdata --- data/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/meson.build b/data/meson.build index ab3d4d0..3e05a9a 100644 --- a/data/meson.build +++ b/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) - if appstream_util.found() - test('Validate appstream file', appstream_util, - args: ['validate', appstream_file] + appstreamcli = find_program('appstreamcli', required: false) + if appstreamcli.found() + test('Validate appstream file', appstreamcli, + args: ['validate', '--no-net', '--explain', appstream_file] ) endif endif From 4a4e62d6ef608da2bd8e932b5fdb9f741fe36aec Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Sat, 6 Jan 2024 21:24:50 -0500 Subject: [PATCH 2/4] cicd: udpate actions and images - actions/checkout@v3 -> v4 - actions/setup-python@v4 -> v5 - bilelmoussaoui/flatpak-github-actions:gnome-44 -> gnome-45 --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96af8d4..a4df04b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: '3.8' @@ -40,8 +40,8 @@ jobs: meson-build-test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@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 @@ -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/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: '3.8' - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 From 59c89af79d1751ad64fc716611fc35c42a8796ce Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Sat, 6 Jan 2024 21:26:50 -0500 Subject: [PATCH 3/4] cicd: remove Ubuntu package appstream-util not used anymore now that the project uses `appstreamcli`. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4df04b..a130ad6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: - 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 From ac203e0394d24a870ae83048d94e4a2b65667caf Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Sat, 6 Jan 2024 21:35:29 -0500 Subject: [PATCH 4/4] chore: add changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e7f960..5f1e15b 100644 --- a/CHANGELOG.md +++ b/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