[gnome-builder] gitlabci: Use flatpak build instead of flatpak-builder.

[Jordan Petridis <jpetridis src gnome org>]

commit de3d06e8465f37d60001ed55916ab4b57b645e6f
Author: Jordan Petridis <jordanpetridis protonmail com>
Date:   Thu Apr 5 01:53:15 2018 +0300

    gitlabci: Use flatpak build instead of flatpak-builder.

 .gitlab-ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94d6caa2a..f71f206f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,17 +14,16 @@ flatpak:
         # - export FLATPAK_ARTIFACT=gnome-builder-${COMMIT_REF_SHA}.flatpak
 
         # Build the flatpak repo
-        - flatpak-builder --force-clean --stop-at=gnome-builder app build-aux/flatpak/org.gnome.Builder.json
-        - flatpak-builder --run app build-aux/flatpak/org.gnome.Builder.json meson --prefix=/app 
--libdir=/app/lib _build
-        - flatpak-builder --run app build-aux/flatpak/org.gnome.Builder.json ninja -C _build install
-        - flatpak-builder --finish-only app build-aux/flatpak/org.gnome.Builder.json
-        - flatpak build-export repo app
+        - flatpak-builder --stop-at=gnome-builder app build-aux/flatpak/org.gnome.Builder.json
+        - flatpak build app meson --prefix=/app _build
+        - flatpak build app ninja -C _build install
+        - flatpak-builder --finish-only --repo=repo app build-aux/flatpak/org.gnome.Builder.json
 
         # Make a flatpak for people to test
-        - flatpak build-bundle repo $FLATPAK_ARTIFACT org.gnome.Builder
+        - flatpak build-bundle repo $FLATPAK_ARTIFACT 
--runtime-repo=https://sdk.gnome.org/gnome-nightly.flatpakrepo org.gnome.Builder
 
         # Run tests inside the Flatpak env
-        # - flatpak-builder --run app build-aux/flatpak/org.gnome.Builder.json ninja -C _build test
+        # - flatpak-builder --run app build-aux/flatpak/org.gnome.Builder.json ninja -C _build tes
 
     artifacts:
         paths: