fix: build pruduction manifest on CI & update install versions inREADME

Author: bahrom04

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -26,13 +26,12 @@ jobs:
     name: Flatpak
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-46
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-49
       options: --privileged
     steps:
-    - uses: actions/checkout@v4
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
-      with:
-        bundle: gtk-rust-template.flatpak
-        manifest-path: build-aux/com.belmoussaoui.GtkRustTemplate.Devel.json
-        run-tests: true
-        cache-key: flatpak-builder-${{ github.sha }}
+      - uses: actions/checkout@v6
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: gtk-rust-template.flatpak
+          manifest-path: build-aux/com.belmoussaoui.GtkRustTemplate.json
+          cache-key: flatpak-builder-${{ github.sha }}

README.md

@@ -61,7 +61,7 @@ A new directory named `contrast` containing the generated project
 Make sure you have `flatpak` and `flatpak-builder` installed. Then run the commands below. Replace `<application_id>` with the value you entered during project creation. Please note that these commands are just for demonstration purposes. Normally this would be handled by your IDE, such as GNOME Builder or VS Code with the Flatpak extension.
 
 ```shell
-flatpak install --user org.gnome.Sdk//49 org.gnome.Platform//49  org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.llvm18//23.08
+flatpak install --user org.gnome.Sdk//49 org.gnome.Platform//49  org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.llvm21//25.08
 flatpak-builder --user flatpak_app build-aux/<application_id>.Devel.json
 ```
 

build-aux/com.belmoussaoui.GtkRustTemplate.Devel.json

@@ -5,7 +5,7 @@
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm20"
+        "org.freedesktop.Sdk.Extension.llvm21"
     ],
     "command": "gtk-rust-template",
     "finish-args": [
@@ -18,7 +18,7 @@
         "--env=RUST_BACKTRACE=1"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm20/bin",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm21/bin",
         "build-args": [
             "--share=network"
         ],

build-aux/com.belmoussaoui.GtkRustTemplate.json

@@ -0,0 +1,46 @@
+{
+    "id": "com.belmoussaoui.GtkRustTemplate",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "49",
+    "sdk": "org.gnome.Sdk",
+    "sdk-extensions": [
+        "org.freedesktop.Sdk.Extension.rust-stable",
+        "org.freedesktop.Sdk.Extension.llvm21"
+    ],
+    "command": "gtk-rust-template",
+    "finish-args": [
+        "--share=ipc",
+        "--socket=fallback-x11",
+        "--socket=wayland",
+        "--device=dri",
+        "--env=RUST_LOG=gtk_rust_template=debug",
+        "--env=G_MESSAGES_DEBUG=none",
+        "--env=RUST_BACKTRACE=1"
+    ],
+    "build-options": {
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm21/bin",
+        "build-args": ["--share=network"],
+        "env": {
+            "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
+            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
+            "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
+            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER": "clang",
+            "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"
+        },
+        "test-args": ["--socket=x11", "--share=network"]
+    },
+    "modules": [
+        {
+            "name": "gtk-rust-template",
+            "buildsystem": "meson",
+            "run-tests": true,
+            "config-opts": ["-Dprofile=development"],
+            "sources": [
+                {
+                    "type": "dir",
+                    "path": "../"
+                }
+            ]
+        }
+    ]
+}

create-project.py

@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 
 import os
-import sys
-import subprocess
+import platform
 import shutil
-from pathlib import Path
+import subprocess
+import sys
 import urllib.request
 import zipfile
-import subprocess
-import platform
+from pathlib import Path
 
 print("Welcome to GTK Rust Template")
 while True:
@@ -68,9 +67,11 @@
         exit()
 
 if online:
-    zip_destination, _ = urllib.request.urlretrieve(files_url, current_dir / "relm4-template.zip")
+    zip_destination, _ = urllib.request.urlretrieve(
+        files_url, current_dir / "relm4-template.zip"
+    )
 
-    with zipfile.ZipFile(zip_destination, 'r') as zip_ref:
+    with zipfile.ZipFile(zip_destination, "r") as zip_ref:
         zip_ref.extractall(current_dir)
 
     os.remove(zip_destination)
@@ -153,7 +154,9 @@
 
 for file in files_to_rename:
     current_path = project_dir / file
-    new_path = project_dir / file.parent / str(file.name).replace(CURRENT_APP_ID, app_id)
+    new_path = (
+        project_dir / file.parent / str(file.name).replace(CURRENT_APP_ID, app_id)
+    )
     shutil.move(current_path, new_path)
 
 
@@ -202,4 +205,4 @@
     subprocess.Popen(["xdg-open", current_dir])
 else:
     print("Failed to open project path, unsupported operating system.")
-    print("Created project at: " + current_dir)
+    print("Created project at: ", current_dir)

default.nix

@@ -43,7 +43,7 @@ in
       pkg-config
       rust-analyzer
       wrapGAppsHook4
-      appstream-glib
+      appstream
       desktop-file-utils
       rustPlatform.cargoSetupHook
     ];

shell.nix

@@ -30,6 +30,7 @@ in
       ninja
       parted
       gettext
+      appstream
       pkg-config
       gdk-pixbuf
       libadwaita