From 5a68a5948ff936ce12963981816164a4483f9210 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sun, 6 Aug 2023 09:46:50 -0400
Subject: [PATCH] Add flatpak CI

---
 .build.yml         | 8 ++++++++
 zone.xiv.astra.yml | 1 +
 2 files changed, 9 insertions(+)

diff --git a/.build.yml b/.build.yml
index d9b3c32..672eb66 100644
--- a/.build.yml
+++ b/.build.yml
@@ -13,6 +13,7 @@ packages:
   - unshield
   - gamemode
   - reuse
+  - flatpak-builder
 sources:
   - https://git.sr.ht/~redstrate/astra
 tasks:
@@ -25,5 +26,12 @@ tasks:
   - build: |
       cd astra
       cmake --build build
+  - flatpak: |
+      cd astra
+      flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+      flatpak install --user -y runtime/org.kde.Platform/x86_64/5.15-22.08 runtime/org.kde.Sdk/x86_64/5.15-22.08 org.freedesktop.Sdk.Extension.rust-stable/x86_64/22.08 
+      flatpak-builder build --user --force-clean zone.xiv.astra.yml 
+      flatpak build-export export --user build
+      flatpak build-bundle export --user astra.flatpak zone.xiv.astra --runtime-repo=https://flathub.org/repo/flathub.flatpakrep
 artifacts:
   - astra/build/bin/astra
\ No newline at end of file
diff --git a/zone.xiv.astra.yml b/zone.xiv.astra.yml
index e2a0ec4..afc33c1 100644
--- a/zone.xiv.astra.yml
+++ b/zone.xiv.astra.yml
@@ -31,6 +31,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/frankosterfeld/qtkeychain.git
+        branch: main
   - name: quazip
     buildsystem: cmake-ninja
     sources: