From 226af7e2280961721941f2796ebd0c6d81b80fa2 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 27 Dec 2023 03:50:39 +0100
Subject: [PATCH] Fix flatpak build

---
 .github/workflows/flatpak.yml | 10 +---------
 com.quexten.Goldwarden.yml    | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 5b20c84..3a68c68 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     branches: [main]
 jobs:
-    flatpak:
+  flatpak:
       name: "Flatpak"
       runs-on: ubuntu-latest
       container:
@@ -13,14 +13,6 @@ jobs:
         options: --privileged
       steps:
       - uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.20'
-      - name: Install libfido2-dev
-        run: sudo apt-get install -y libfido2-dev
-      - name: Build
-        run: go build -o goldwarden -v .
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: goldwarden.flatpak
diff --git a/com.quexten.Goldwarden.yml b/com.quexten.Goldwarden.yml
index 73a9b76..5627a9a 100644
--- a/com.quexten.Goldwarden.yml
+++ b/com.quexten.Goldwarden.yml
@@ -37,18 +37,20 @@ modules:
   - name: goldwarden-ui
     buildsystem: simple
     build-commands:
-      - install -D main.py /app/bin/main.py
-      - cp -R ./ /app/bin
-      - install -D com.quexten.Goldwarden.desktop /app/share/applications/com.quexten.Goldwarden.desktop
-      - install -Dm644 com.quexten.Goldwarden.metainfo.xml -t /app/share/metainfo/
-      - install -D goldwarden.svg /app/share/icons/hicolor/scalable/apps/com.quexten.Goldwarden.svg
+      - install -D ./ui/main.py /app/bin/main.py
+      - cp -R ./ui/ /app/bin
+      - install -D ./ui/com.quexten.Goldwarden.desktop /app/share/applications/com.quexten.Goldwarden.desktop
+      - install -Dm644 ./ui/com.quexten.Goldwarden.metainfo.xml -t /app/share/metainfo/
+      - install -D ./ui/goldwarden.svg /app/share/icons/hicolor/scalable/apps/com.quexten.Goldwarden.svg
     sources:
-      - type: dir
-        path: ui
+      - type: archive
+        url: https://github.com/quexten/goldwarden/archive/refs/tags/v0.2.1.tar.gz
+        sha256: 9dbac2eeb524ed9bc70c4019dac6e826fa179520d604135e36d826361b86e8b8
   - name: goldwarden
     buildsystem: simple
     build-commands:
-      - install -D goldwarden /app/bin/goldwarden
+      - install -D goldwarden_linux_x86_64 /app/bin/goldwarden
     sources:
       - type: file
-        path: goldwarden
\ No newline at end of file
+        url: https://github.com/quexten/goldwarden/releases/download/v0.2.1/goldwarden_linux_x86_64
+        sha256: 7ebc9684a0e8967ea1ad911269bb69e3918e4e508b4d57268a152b08f57b37aa
\ No newline at end of file