From 1409510a5707f441d3d61148fee38ef9a6d68b1f Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
Date: Sun, 7 Feb 2021 14:22:31 +0100
Subject: [PATCH] CI: fix flatpak action (#281)

* CI: fix flatpak action

* Flatpak: update manifest

include libhandy & fix the module's type
---
 .github/workflows/build.yml      |  5 +++--
 com.github.bleakgrey.tootle.json | 20 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f6ae4af..93a83ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,9 +6,9 @@ name: CI
 jobs:
   flatpak-builder:
     name: "Flatpak Builder"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-3-38
+      image: bilelmoussaoui/flatpak-github-actions:gnome-3.38
       options: --privileged
     steps:
     - uses: actions/checkout@v2
@@ -16,3 +16,4 @@ jobs:
       with:
         bundle: "com.github.bleakgrey.tootle.flatpak"
         manifest-path: "com.github.bleakgrey.tootle.json"
+        run-tests: "true"
diff --git a/com.github.bleakgrey.tootle.json b/com.github.bleakgrey.tootle.json
index 5fea070..34414d0 100644
--- a/com.github.bleakgrey.tootle.json
+++ b/com.github.bleakgrey.tootle.json
@@ -26,14 +26,30 @@
     "*.a"
   ],
   "modules": [
+    {
+      "name": "libhandy",
+      "buildsystem": "meson",
+      "config-opts": [
+        "-Dtests=false",
+        "-Dexamples=false",
+        "-Dglade_catalog=disabled"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://ftp.acc.umu.se/pub/GNOME/sources/libhandy/1.0/libhandy-1.0.3.tar.xz",
+          "sha256": "559bb3acc2c362488917eb72ed25bdc181f4ae26ac94d177634cc5d34c867f7a"
+        }
+      ]
+    },
     {
       "name": "tootle",
       "builddir": true,
       "buildsystem": "meson",
       "sources": [
         {
-          "type": "git",
-          "url": "https://github.com/bleakgrey/tootle.git"
+          "type": "dir",
+          "path": "."
         }
       ]
     }