Skip to content

Commit fb5423b

Browse files
authored
Merge pull request MightyCreak#223 from MightyCreak/update-cicd
feat(build): use appstreamcli to validate appdata
2 parents a65acad + ac203e0 commit fb5423b

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
lint:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
20-
- uses: actions/setup-python@v4
19+
- uses: actions/checkout@v4
20+
- uses: actions/setup-python@v5
2121
with:
2222
python-version: '3.8'
2323

@@ -40,11 +40,11 @@ jobs:
4040
meson-build-test:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v3
44-
- uses: actions/setup-python@v4
43+
- uses: actions/checkout@v4
44+
- uses: actions/setup-python@v5
4545
with:
4646
python-version: '3.8'
47-
- run: sudo apt-get -y install meson appstream appstream-util desktop-file-utils gettext
47+
- run: sudo apt-get -y install meson appstream desktop-file-utils gettext
4848
- run: pip install meson ninja
4949
- run: meson setup build
5050
- run: meson compile -C build
@@ -53,11 +53,11 @@ jobs:
5353
flatpak-build-test:
5454
runs-on: ubuntu-latest
5555
container:
56-
image: bilelmoussaoui/flatpak-github-actions:gnome-44
56+
image: bilelmoussaoui/flatpak-github-actions:gnome-45
5757
options: --privileged
5858
steps:
59-
- uses: actions/checkout@v3
60-
- uses: actions/setup-python@v4
59+
- uses: actions/checkout@v4
60+
- uses: actions/setup-python@v5
6161
with:
6262
python-version: '3.8'
6363
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- Update from GNOME 44 to 45 (@sabriunal)
1313
- Flatpak manifest now runs the tests (@sabriunal)
14+
- Use `appstreamcli` instead of the deprecated `appstream-util` to validate
15+
appdata (@sabriunal)
1416

1517
### Removed
1618

@@ -20,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2022

2123
- Fix compatibility with Python 3.12: remove use of `distutils` (@MightyCreak)
2224
- Fix new errors raised by Flake8 (@MightyCreak)
25+
- Fix the error with the CICD due to the use of `appstreamcli` (@MightyCreak)
2326

2427
## 0.8.2 - 2023-04-16
2528

data/meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ if build_machine.system() == 'linux'
3333
install_dir: join_paths(get_option('datadir'), 'appdata')
3434
)
3535

36-
appstream_util = find_program('appstream-util', required: false)
37-
if appstream_util.found()
38-
test('Validate appstream file', appstream_util,
39-
args: ['validate', appstream_file]
36+
appstreamcli = find_program('appstreamcli', required: false)
37+
if appstreamcli.found()
38+
test('Validate appstream file', appstreamcli,
39+
args: ['validate', '--no-net', '--explain', appstream_file]
4040
)
4141
endif
4242
endif

0 commit comments

Comments
 (0)