fix(ci): flatpak (#1316)

GeopJr · Jan 31, 2025 · feab622 · feab622
1 parent 62b8dc0
commit feab622
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ lint ]
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-43
+      image: bilelmoussaoui/flatpak-github-actions:gnome-47
       options: --privileged
     strategy:
       matrix:
@@ -39,7 +39,7 @@ jobs:
       uses: docker/setup-qemu-action@v2
       with:
         platforms: arm64
-    - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+    - uses: flathub-infra/flatpak-github-actions/flatpak-builder@4388a4c5fc8bab58e1dfb7fc63267dca0f7b4976
       with:
         bundle: "dev.geopjr.Tuba.Devel.flatpak"
         run-tests: true

diff --git a/build-aux/dev.geopjr.Tuba.Devel.json b/build-aux/dev.geopjr.Tuba.Devel.json
@@ -3,6 +3,7 @@
     "runtime": "org.gnome.Platform",
     "runtime-version": "47",
     "sdk": "org.gnome.Sdk",
+    "sdk-extensions": [ "org.freedesktop.Sdk.Extension.llvm19" ],
     "command": "dev.geopjr.Tuba",
     "finish-args": [
         "--device=dri",
@@ -26,12 +27,23 @@
     ],
     "modules": [
         {
-            "name" : "libspelling",
-            "buildsystem" : "meson",
-            "config-opts" : [
+            "name": "libspelling",
+            "buildsystem": "meson",
+            "config-opts": [
                 "-Ddocs=false"
             ],
-            "sources" : [
+			"build-options": {
+                "arch": {
+                    "aarch64": {
+                        "append-path": "/usr/lib/sdk/llvm19/bin",
+                        "prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib",
+                        "env": {
+                          "CC": "clang"
+                        }
+                    }
+                }
+            },
+            "sources": [
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/libspelling.git",
@@ -43,9 +55,20 @@
             "name": "tuba",
             "builddir": true,
             "buildsystem": "meson",
-            "config-opts" : [
+            "config-opts": [
                 "-Ddevel=true"
             ],
+            "build-options": {
+                "arch": {
+                    "aarch64": {
+                        "append-path": "/usr/lib/sdk/llvm19/bin",
+                        "prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib",
+                        "env": {
+                          "CC": "clang"
+                        }
+                    }
+                }
+            },
             "sources": [
                 {
                     "type": "dir",