From a008b32a47b45f9e6b2d70cbeaddc6cc37c8c19f Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Tue, 29 Apr 2025 15:41:27 -0400
Subject: [PATCH] Build Flatpak on the CI (#31)

This provides a downloadable development Flatpak version, which is more portable than the Linux artifact.
---
 .github/workflows/main.yml | 47 ++++++++++++++++----------------------
 launcher/src/main.cpp      |  8 +++----
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f35bb67..dcf6c8d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,14 +7,13 @@ on:
     branches: [ "main" ]
 
 env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 2
-  MAKEFLAGS: '-j 2'
-  QT_VERSION: 6.8.1 # Keep in sync with CMakeLists.txt
-  KF_VERSION: v6.10.0 # Ditto
+  QT_VERSION: 6.8.2 # Keep in sync with CMakeLists.txt
+  KF_VERSION: v6.13.0 # Ditto
   KIRIGAMI_ADDONS_VERSION: v1.7.0 # Ditto x2
 
 jobs:
   reuse:
+    name: "REUSE"
     runs-on: ubuntu-latest
 
     steps:
@@ -23,6 +22,7 @@ jobs:
       uses: fsfe/reuse-action@v5
 
   build:
+    name: "Build"
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -312,30 +312,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
 
-  #build-flatpak:
-  #  runs-on: ubuntu-latest
-
-  #  steps:
-  #    - uses: actions/checkout@v4
-  #      with:
-  #        submodules: true
-
-  #    - name: Setup Linux dependencies
-  #      run: |
-  #        sudo apt-get update
-  #        sudo apt-get install \
-  #          flatpak-builder \
-
-  #    - name: Build Flatpak
-  #      run: |
-  #        ./scripts/build-flatpak.sh
-
-  #    - name: Archive artifacts
-  #      uses: actions/upload-artifact@v4
-  #      with:
-  #        name: flatpak
-  #        path: astra.flatpak
+  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.astra.yml
+          cache-key: flatpak-builder-${{ github.sha }}
\ No newline at end of file
diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp
index 7ce93fa..d20bc45 100755
--- a/launcher/src/main.cpp
+++ b/launcher/src/main.cpp
@@ -61,22 +61,22 @@ int main(int argc, char *argv[])
                     QUrl(QStringLiteral("https://redstrate.com/rss-image.png")));
     about.setHomepage(QStringLiteral("https://xiv.zone/astra"));
     about.addComponent(QStringLiteral("physis"),
-                       i18n("Library to access FFXIV data"),
+                       i18n("Library for reading and writing FFXIV data."),
                        QString::fromLatin1(physis_get_physis_version()),
                        QStringLiteral("https://xiv.zone/physis"),
                        KAboutLicense::GPL_V3);
     about.addComponent(QStringLiteral("libphysis"),
-                       i18n("C bindings for physis"),
+                       i18n("C/C++ bindings for Physis."),
                        QString::fromLatin1(physis_get_libphysis_version()),
                        QStringLiteral("https://github.com/redstrate/libphysis"),
                        KAboutLicense::GPL_V3);
     about.addComponent(QStringLiteral("KDSingleApplication"),
-                       i18n("Helper class for single-instance policy applications "),
+                       i18n("Helper class for single-instance policy applications."),
                        QStringLiteral("1.1.1"),
                        QStringLiteral("https://github.com/KDAB/KDSingleApplication"),
                        KAboutLicense::MIT);
     about.addComponent(QStringLiteral("libcotp"),
-                       i18n(" C library that generates TOTP and HOTP "),
+                       i18n(" C library that generates TOTP and HOTP."),
                        QStringLiteral("3.0.0"),
                        QStringLiteral("https://github.com/paolostivanin/libcotp"),
                        KAboutLicense::Unknown);