Add new Flatpak manifest, build it in CI

2 files changed, 62 insertions, 25 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40db59e..88cc0c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,9 @@
 stages:
-  - lint
   - build
 
-variables:
-  ZENHASKELL_IMAGE: "zenhaskell/gtk:lts-12.20"
-
-lint:
-  stage: lint
-  image: ${ZENHASKELL_IMAGE}
-  script:
-  - hlint .
-
-stack-build-test:
-  stage: build
-  image: ${ZENHASKELL_IMAGE}
-  before_script:
-    - apt install -y libpcap-dev
-  script:
-    - stack build
-    - stack test
-  cache:
-    key: "stack-work"
-    paths:
-      - .stack-work
-
 flatpak-build:
   stage: build
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.28
+  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32
   only:
     refs:
     - master
@@ -40,7 +17,7 @@ flatpak-build:
     RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
 
   script:
-    - flatpak-builder --repo ${REPO} app flatpak/${APP_ID}.yaml
+    - flatpak-builder --repo ${REPO} app ${APP_ID}.json
     - flatpak build-bundle --runtime-repo=${RUNTIME_REPO} ${REPO} ${BUNDLE} ${APP_ID}
 
   artifacts:
diff --git a/org.freedesktop.Bustle.json b/org.freedesktop.Bustle.json
new file mode 100644
index 0000000..099e337
--- /dev/null
+++ b/org.freedesktop.Bustle.json
@@ -0,0 +1,60 @@
+{
+    "app-id": "org.freedesktop.Bustle",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "3.32",
+    "sdk": "org.gnome.Sdk",
+    "command": "bustle",
+    "finish-args": [
+        "--socket=x11",
+        "--socket=wayland",
+        "--socket=system-bus",
+        "--socket=session-bus",
+        "--share=ipc",
+        "--filesystem=xdg-run/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf",
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+        "--filesystem=host"
+    ],
+    "cleanup": [
+        "*.a",
+        "*.h",
+        "/share/man/man?/pcap*",
+        "/bin/pcap-config"
+    ],
+    "modules": [
+        {
+            "name": "libpcap",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://www.tcpdump.org/release/libpcap-1.9.0.tar.gz",
+                    "sha256": "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019"
+                }
+            ]
+        },
+        {
+            "name": "help2man",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://ftpmirror.gnu.org/help2man/help2man-1.47.4.tar.xz",
+                    "sha256": "d4ecf697d13f14dd1a78c5995f06459bff706fd1ce593d1c02d81667c0207753"
+                }
+            ],
+            "cleanup": [
+                "*"
+            ]
+        },
+        {
+            "name": "bustle",
+            "sources": [
+                {
+                    "type": "dir",
+                    "path": "."
+                }
+            ],
+            "buildsystem": "meson"
+        }
+    ]
+}