From 4247bf0fb64f5d9e65ac83f7cc48555c43e07cfd Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 12 Feb 2020 18:21:00 +0000
Subject: [PATCH] ci: Update flatpak job

Use `flatpak build` and point at the nightly repo when generating the
bundle.
---
 .gitlab-ci/flatpak-build.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci/flatpak-build.sh b/.gitlab-ci/flatpak-build.sh
index 7b9464d130..9b27b6290e 100644
--- a/.gitlab-ci/flatpak-build.sh
+++ b/.gitlab-ci/flatpak-build.sh
@@ -4,7 +4,7 @@ set -e
 
 appid=$1
 
-builddir=app
+builddir=flatpak_app
 repodir=repo
 
 flatpak-builder \
@@ -12,12 +12,10 @@ flatpak-builder \
         ${builddir} \
         build-aux/flatpak/${appid}.json
 
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        meson \
-                --prefix /app \
-                --libdir /app/lib \
-                --buildtype release \
+flatpak build ${builddir} meson \
+                --prefix=/app \
+                --libdir=/app/lib \
+                --buildtype=release \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
                 -Dprint-backends=file \
@@ -27,9 +25,7 @@ flatpak-builder \
                 -Ddemos=true \
                 _build .
 
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        ninja -C _build install
+flatpak build ${builddir} ninja -C _build install
 
 flatpak-builder \
         --finish-only \
@@ -40,5 +36,5 @@ flatpak-builder \
 flatpak build-bundle \
         ${repodir} \
         ${appid}-dev.flatpak \
-        --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \
+        --runtime-repo=https://nightly.gnome.org/gnome-nightly.flatpakrepo \
         ${appid}