Skip to content

Commit 6b213ab

Browse files
authored
Merge pull request #251 from MightyCreak/chore/update-github-actions
chore(cicd): update GitHub actions
2 parents 2913224 + 1e86bbd commit 6b213ab

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ 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-latest
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: actions/setup-python@v5
2121
with:
22-
python-version: '3.8'
22+
python-version: '3.9'
2323

2424
- name: Install dependencies
2525
run: |
26-
sudo apt-get -y install libgirepository1.0-dev
26+
sudo apt-get update && sudo apt-get -y install libcairo2-dev libgirepository-2.0-dev
2727
pip install -r requirements.dev.txt
2828
pip list
2929
@@ -38,32 +38,30 @@ jobs:
3838
mypy src/ po/
3939
4040
meson-build-test:
41-
runs-on: ubuntu-latest
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-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
4545
steps:
4646
- uses: actions/checkout@v4
4747
- uses: actions/setup-python@v5
4848
with:
49-
python-version: '3.8'
50-
# Extra installation since we are not using ubuntu-latest
51-
- run: apt-get update && apt-get -y install libglib2.0-dev-bin
52-
- run: apt-get -y install meson appstream desktop-file-utils gettext
49+
python-version: '3.9'
50+
- run: sudo apt-get update && sudo apt-get -y install libglib2.0-dev-bin meson appstream desktop-file-utils gettext
5351
- run: meson setup build
5452
- run: meson compile -C build
5553
- run: meson test --print-errorlogs -C build
5654

5755
flatpak-build-test:
58-
runs-on: ubuntu-latest
56+
runs-on: ubuntu-24.04
5957
container:
60-
image: bilelmoussaoui/flatpak-github-actions:gnome-45
58+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-46
6159
options: --privileged
6260
steps:
6361
- uses: actions/checkout@v4
6462
- uses: actions/setup-python@v5
6563
with:
66-
python-version: '3.8'
64+
python-version: '3.9'
6765
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
6866
with:
6967
bundle: "diffuse.flatpak"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2121

2222
- Docs: fix incorrect flatpak command to install runtime SDK (@MightyCreak)
2323
- Update to flatpak's GNOME runtime 46 (@MightyCreak)
24+
- Update GitHub actions: use Ubuntu 24.04, Python 3.9 and new Flatpak image (@MightyCreak)
2425

2526
## 0.9.0 - 2024-01-13
2627

docs/developers/developers-setup.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ examples should be enough to find the packages on most systems.
1919
<summary>Debian/Ubuntu</summary>
2020

2121
```sh
22-
sudo apt install python3-pip libcairo2-dev libgirepository1.0-dev meson flatpak flatpak-builder
22+
sudo apt install python3-pip libcairo2-dev libgirepository-2.0-dev \
23+
meson flatpak flatpak-builder
2324
```
2425

2526
_Note: Tested on Debian 11 (Buster) and Ubuntu 20.04 (Focal)_
@@ -28,7 +29,8 @@ _Note: Tested on Debian 11 (Buster) and Ubuntu 20.04 (Focal)_
2829
<summary>Fedora</summary>
2930

3031
```sh
31-
sudo dnf install python-pip cairo-devel cairo-gobject-devel meson flatpak flatpak-builder
32+
sudo dnf install python-pip cairo-devel cairo-gobject-devel \
33+
meson flatpak flatpak-builder
3234
```
3335

3436
_Note: Tested on Fedora 36_

0 commit comments

Comments
 (0)