Fix flatpak build

quexten · Dec 27, 2023 · 226af7e · 226af7e
1 parent 7ecfe64
commit 226af7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -5,22 +5,14 @@ on:
   pull_request:
     branches: [main]
 jobs:
-    flatpak:
+  flatpak:
       name: "Flatpak"
       runs-on: ubuntu-latest
       container:
         image: bilelmoussaoui/flatpak-github-actions:gnome-45
         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
@@ -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
+        url: https://github.com/quexten/goldwarden/releases/download/v0.2.1/goldwarden_linux_x86_64
+        sha256: 7ebc9684a0e8967ea1ad911269bb69e3918e4e508b4d57268a152b08f57b37aa