From 2935b5de1c1e75af1a3080ab59c44386c74ee4f7 Mon Sep 17 00:00:00 2001
From: Maxim Logaev <maxlogaev@proton.me>
Date: Tue, 2 Apr 2024 19:17:31 +0300
Subject: [PATCH] Fixed flatpak bundle name

Signed-off-by: Maxim Logaev <maxlogaev@proton.me>
---
 .github/workflows/build.yml | 23 +++++++----------------
 build-flatpack.sh           |  6 +++---
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a22a5c35..f6a39907 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,25 +28,16 @@ jobs:
       - run: build/plugins/omemo/test_omemo
   build-flatpak:
     runs-on: ubuntu-22.04
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-44
-      options: --privileged
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
-      - run: flatpak repair --user
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
+      - run: sudo apt-get update
+      - run: sudo apt-get install -y flatpak flatpak-builder
+      - run: ./build-flatpack.sh
+      - name: Upload Dino flatpak
+        uses: actions/upload-artifact@v4
         with:
-          manifest-path: im.dino.Dino.json
-          build-bundle: true
-      - name: Release Dino installer
-        if: ${{ github.ref_type == 'tag' }}
-        uses: svenstaro/upload-release-action@2.9.0
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: app.flatpak
-          asset_name: app.flatpak
-          tag: ${{ github.ref }}
-          release_name: Dino ${{ github.ref_name }}
+          name: im.dino.Dino.flatpak
+          path: im.dino.Dino.flatpak
diff --git a/build-flatpack.sh b/build-flatpack.sh
index 01b4e615..bab6c65f 100755
--- a/build-flatpack.sh
+++ b/build-flatpack.sh
@@ -21,9 +21,9 @@ fatal()
 get_flatpak_dependencies()
 {
     msg "Installing Flatpak dependencies..."
-    flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-    flatpak install flathub org.gnome.Sdk//44
-    flatpak install flathub org.gnome.Platform//44
+    flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+    flatpak install --user -y flathub org.gnome.Sdk//44
+    flatpak  install --user -y flathub org.gnome.Platform//44
     msg "Flatpak dependencies installed"
 }