Update CI for Flatpak and GNOME 48

* Bump Flatpak's Gnome from 47 to 48 and require libadwaita 1.5 at least
* Use the official github actions image instaed
* Combine CI jobs to avoid duplicated tasks between commit and releases

Author: trufae

.github/workflows/build.yml .github/workflows/ci.yml.github/workflows/build.yml renamed to .github/workflows/ci.yml

@@ -1,11 +1,15 @@
-name: Build
+name: CI
 
 on:
   push:
     branches: [master]
+    tags: ['*']
   pull_request:
     branches: [master]
 
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-24.04
@@ -55,16 +59,16 @@ jobs:
       - name: Package .deb
         run: make deb
 
-      - name: Upload .deb artifacts
+      - name: Upload .deb artifact
         uses: actions/upload-artifact@v7
         with:
-          name: deltachat-gnome-ubuntu-24.04
+          name: deltachat-gnome-deb
           path: dist/debian/deltachat-gnome/*.deb
 
   build-flatpak:
     runs-on: ubuntu-24.04
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-47
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
       options: --privileged
     steps:
       - uses: actions/checkout@v6
@@ -73,9 +77,22 @@ jobs:
         with:
           manifest-path: dist/flatpak/org.deltachat.Gnome.json
           bundle: deltachat-gnome.flatpak
+          cache-key: flatpak-builder-${{ hashFiles('dist/flatpak/org.deltachat.Gnome.json') }}
 
-      - name: Upload .flatpak artifact
-        uses: actions/upload-artifact@v7
+  release:
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: [build-deb, build-flatpak]
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v7
+        with:
+          path: artifacts
+          merge-multiple: true
+
+      - name: Publish release
+        uses: softprops/action-gh-release@v2
         with:
-          name: deltachat-gnome-flatpak
-          path: deltachat-gnome.flatpak
+          files: |
+            artifacts/**/*.deb
+            artifacts/**/*.flatpak

.github/workflows/release.yml

@@ -1,7 +1,7 @@
 {
     "id": "org.deltachat.Gnome",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "47",
+    "runtime-version": "48",
     "sdk": "org.gnome.Sdk",
     "command": "deltachat-gnome",
     "finish-args": [

dist/flatpak/org.deltachat.Gnome.json

@@ -7,7 +7,7 @@ deps = [
   dependency('glib-2.0'),
   dependency('gio-2.0'),
   dependency('gtk4'),
-  dependency('libadwaita-1', version: '>= 1.0'),
+  dependency('libadwaita-1', version: '>= 1.5'),
   dependency('json-glib-1.0'),
 ]