diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d436003..bd6011d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,16 +14,16 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.9' - name: Install dependencies run: | - sudo apt-get -y install libgirepository1.0-dev + sudo apt-get update && sudo apt-get -y install libcairo2-dev libgirepository-2.0-dev pip install -r requirements.dev.txt pip list @@ -38,32 +38,30 @@ jobs: mypy src/ po/ meson-build-test: - runs-on: ubuntu-latest - container: - # Use Ubuntu 23.04 in order to have appstreamcli v0.16 instead of 0.15. - image: ubuntu:23.04 + runs-on: ubuntu-24.04 + # container: + # # Use Ubuntu 23.04 in order to have appstreamcli v0.16 instead of 0.15. + # image: ubuntu:23.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.8' - # Extra installation since we are not using ubuntu-latest - - run: apt-get update && apt-get -y install libglib2.0-dev-bin - - run: apt-get -y install meson appstream desktop-file-utils gettext + python-version: '3.9' + - run: sudo apt-get update && sudo apt-get -y install libglib2.0-dev-bin meson appstream desktop-file-utils gettext - run: meson setup build - run: meson compile -C build - run: meson test --print-errorlogs -C build flatpak-build-test: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 container: - image: bilelmoussaoui/flatpak-github-actions:gnome-45 + image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-46 options: --privileged steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.9' - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: "diffuse.flatpak" diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a6b712..42823fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Docs: fix incorrect flatpak command to install runtime SDK (@MightyCreak) - Update to flatpak's GNOME runtime 46 (@MightyCreak) +- Update GitHub actions: use Ubuntu 24.04, Python 3.9 and new Flatpak image (@MightyCreak) ## 0.9.0 - 2024-01-13 diff --git a/docs/developers/developers-setup.md b/docs/developers/developers-setup.md index 1e66e70..0da6d33 100644 --- a/docs/developers/developers-setup.md +++ b/docs/developers/developers-setup.md @@ -19,7 +19,8 @@ examples should be enough to find the packages on most systems. Debian/Ubuntu ```sh -sudo apt install python3-pip libcairo2-dev libgirepository1.0-dev meson flatpak flatpak-builder +sudo apt install python3-pip libcairo2-dev libgirepository-2.0-dev \ + meson flatpak flatpak-builder ``` _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)_ Fedora ```sh -sudo dnf install python-pip cairo-devel cairo-gobject-devel meson flatpak flatpak-builder +sudo dnf install python-pip cairo-devel cairo-gobject-devel \ + meson flatpak flatpak-builder ``` _Note: Tested on Fedora 36_