From e0620c7d7a48b54f298f6431f27f9a6a1cd9691e Mon Sep 17 00:00:00 2001
From: Paul Sajna <hello@paulsajna.com>
Date: Sun, 18 Feb 2024 18:29:37 +0000
Subject: [PATCH] flatpak gitlab-ci

---
 .gitlab-ci.yml                             | 43 +++++++++++++++++++++-
 flatpak/com.veilid.veilidchat.metainfo.xml |  3 --
 flatpak/com.veilid.veilidchat.yml          |  1 -
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 948e3e9..468b12d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@
 
 stages:
   - build
+  - build_flatpak
 # - test
 
 .macos_saas_runners:
@@ -12,7 +13,7 @@ stages:
   before_script:
     - echo "started by ${GITLAB_USER_NAME}"
 
-build:
+build_macos:
   extends:
     - .macos_saas_runners
   stage: build
@@ -36,10 +37,48 @@ build:
     #- flutter build appbundle
   when: manual
 
+build_linux_amd64_bundle:
+  tags:
+    - saas-linux-medium-amd64
+  image: ghcr.io/cirruslabs/flutter:3.16.9
+  stage: build
+  script:
+    - apt-get update
+    - apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev lcov rustc cargo
+    - flutter config --enable-linux-desktop
+    - git clone https://gitlab.com/veilid/veilid.git ../veilid
+    - ../veilid/scripts/earthly/install_capnproto.sh
+    - ../veilid/scripts/earthly/install_protoc.sh
+    - dart pub get
+    - flutter build linux
+  artifacts:
+    paths:
+      - build/linux/x64/release/bundle/
+  when: manual
+
+build_linux_amd64_flatpak:
+  tags:
+    - saas-linux-small-amd64
+  image: ubuntu:23.04
+  stage: build_flatpak
+  dependencies: [build_linux_amd64_bundle]
+  script:
+    - apt-get update
+    - apt-get install -y --no-install-recommends flatpak flatpak-builder gnupg2 elfutils ca-certificates
+    - flatpak remote-add --no-gpg-verify --if-not-exists flathub http://flathub.org/repo/flathub.flatpakrepo
+    - flatpak install -y --noninteractive org.gnome.Sdk/x86_64/45  org.gnome.Platform/x86_64/45 app/org.flathub.flatpak-external-data-checker/x86_64/stable org.freedesktop.appstream-glib
+    - pushd flatpak/
+    - flatpak-builder --force-clean build-dir com.veilid.veilidchat.yml --repo=repo
+    - flatpak build-bundle repo com.veilid.veilidchat.flatpak com.veilid.veilidchat
+    - popd
+  artifacts:
+    paths: 
+      - flatpak/com.veilid.veilidchat.flatpak
+  when: manual
+
 #test:
 #  extends:
 #    - .macos_saas_runners
 #  stage: test
 #  script:
 #    - echo "place holder for test"
-
diff --git a/flatpak/com.veilid.veilidchat.metainfo.xml b/flatpak/com.veilid.veilidchat.metainfo.xml
index 28a949c..6df997f 100644
--- a/flatpak/com.veilid.veilidchat.metainfo.xml
+++ b/flatpak/com.veilid.veilidchat.metainfo.xml
@@ -7,9 +7,6 @@
   <id>com.veilid.veilidchat</id>
   <name>VeilidChat</name>
   <summary>VeilidChat Private Messaging</summary>
-  <icon>
-      <local>com.veilid.veilidchat.png</local>
-  </icon>
   <developer_name>Veilid Foundation Inc</developer_name>
   <url type="homepage">https://veilid.com/chat</url>
   <metadata_license>MIT</metadata_license>
diff --git a/flatpak/com.veilid.veilidchat.yml b/flatpak/com.veilid.veilidchat.yml
index 3dc624f..af45e4b 100644
--- a/flatpak/com.veilid.veilidchat.yml
+++ b/flatpak/com.veilid.veilidchat.yml
@@ -16,7 +16,6 @@ finish-args:
   - --share=network
   - --talk-name=org.freedesktop.secrets
 modules:
-  # FlutterApp
   - name: VeilidChat
     buildsystem: simple
     only-arches: