Skip to content

Commit 863cc2e

Browse files
committed
Merge branch 'fix/cicd'
2 parents ac601e9 + 827b2d6 commit 863cc2e

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ on:
1414
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1515
jobs:
1616
lint:
17-
runs-on: ubuntu-24.04
17+
runs-on: ubuntu-26.04
1818
steps:
19-
- uses: actions/checkout@v4
20-
- uses: actions/setup-python@v5
19+
- uses: actions/checkout@v6
20+
- uses: actions/setup-python@v6
2121
with:
22-
python-version: '3.9'
22+
python-version: '3.10'
2323

2424
- name: Install dependencies
2525
run: |
@@ -38,30 +38,27 @@ jobs:
3838
mypy src/ po/
3939
4040
meson-build-test:
41-
runs-on: ubuntu-24.04
42-
# container:
43-
# # Use Ubuntu 23.04 in order to have appstreamcli v0.16 instead of 0.15.
44-
# image: ubuntu:23.04
41+
runs-on: ubuntu-26.04
4542
steps:
46-
- uses: actions/checkout@v4
47-
- uses: actions/setup-python@v5
43+
- uses: actions/checkout@v6
44+
- uses: actions/setup-python@v6
4845
with:
49-
python-version: '3.9'
46+
python-version: '3.10'
5047
- run: sudo apt-get update && sudo apt-get -y install libglib2.0-dev-bin meson appstream desktop-file-utils gettext
5148
- run: meson setup build
5249
- run: meson compile -C build
5350
- run: meson test --print-errorlogs -C build
5451

5552
flatpak-build-test:
56-
runs-on: ubuntu-24.04
53+
runs-on: ubuntu-26.04
5754
container:
5855
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
5956
options: --privileged
6057
steps:
61-
- uses: actions/checkout@v4
62-
- uses: actions/setup-python@v5
58+
- uses: actions/checkout@v6
59+
- uses: actions/setup-python@v6
6360
with:
64-
python-version: '3.9'
61+
python-version: '3.10'
6562
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
6663
with:
6764
bundle: "diffuse.flatpak"

CHANGELOG.md

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

1212
- Update release process documentation (@MightyCreak)
1313

14+
### Fixed
15+
16+
- fix(cicd): update Github CI/CD script (@MightyCreak)
17+
1418
## [0.10.0] - 2025-05-24
1519

1620
### Changed

0 commit comments

Comments
 (0)