From ba835d076fac9a79c623a6171a37c2abfd1b07f0 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Wed, 7 May 2025 21:16:59 -0400
Subject: [PATCH 1/4] Add Flatpak CI job

---
 .github/workflows/main.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c3a0d3f..ef0abc9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -333,3 +333,19 @@ jobs:
       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 }}

From 363be1dcbd00e5353d8a9a8b1c77fa63409254f9 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Wed, 7 May 2025 21:19:51 -0400
Subject: [PATCH 2/4] Only upload binary Windows artifacts

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ef0abc9..a4491ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -330,6 +330,7 @@ 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

From 0534b80cd042b7b1e10a11b4f9fee00a7b4cd8ab Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Wed, 7 May 2025 21:41:37 -0400
Subject: [PATCH 3/4] Add multilib for Flatpak

---
 zone.xiv.novus.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zone.xiv.novus.yml b/zone.xiv.novus.yml
index 9f3871e..4bd1eba 100644
--- a/zone.xiv.novus.yml
+++ b/zone.xiv.novus.yml
@@ -20,6 +20,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

From f4b2a2392972a341726e6a9095b3e4017225c092 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Wed, 7 May 2025 22:00:07 -0400
Subject: [PATCH 4/4] Add the multilib Flatpak SDK extensions

---
 zone.xiv.novus.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zone.xiv.novus.yml b/zone.xiv.novus.yml
index 4bd1eba..0373167 100644
--- a/zone.xiv.novus.yml
+++ b/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