Merge f4b2a23929 into 58425c1ae0

.github/workflows/main.yml

@@ -330,6 +330,23 @@ jobs:
 
     - name: Archive artifacts
       uses: actions/upload-artifact@v4
+      if: runner.os == 'Windows'
       with:
         name: ${{ runner.os }}-package
         path: ${{ steps.strings.outputs.build-output-dir }}/bin
+
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
+      options: --privileged
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: astra.flatpak
+          manifest-path: zone.xiv.novus.yml
+          cache-key: flatpak-builder-${{ github.sha }}

zone.xiv.novus.yml

@@ -4,6 +4,8 @@ runtime-version: '6.8'
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.rust-stable
+  - org.freedesktop.Sdk.Compat.i386
+  - org.freedesktop.Sdk.Extension.toolchain-i386
 command: novus-launcher
 build-options:
   append-path: /usr/lib/sdk/rust-stable/bin
@@ -20,6 +22,11 @@ finish-args:
   - --socket=wayland
   - --share=network
   - --device=dri
+  - --allow=multiarch
+add-extensions:
+  org.freedesktop.Platform.Compat.i386:
+    directory: lib/i386-linux-gnu
+    version: '24.08'
 modules:
   - name: qt6-qthttpserver
     buildsystem: cmake-ninja