From 91bc000d2557aead982911defad9aabc57065e4c Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Tue, 29 Apr 2025 15:16:05 -0400
Subject: [PATCH] Build Flatpak on the CI

---
 .github/workflows/main.yml | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f35bb67..79b95e9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -316,26 +316,16 @@ jobs:
           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
+      - 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