[evince/wip/gpoo/995-flatpak-on-MR: 2/2] ci: Make flatpak-meson target the only flatpak build

[Germán Poo-Caamaño <gpoo src gnome org>]

commit 56adb2440d0a0739f808d2a6c8f1a5475a1a372f
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Wed Oct 10 15:20:24 2018 -0300

    ci: Make flatpak-meson target the only flatpak build
    
    Old flatpak could build only master, as flatpak-meson
    build has replaced it (taking its name).
    
    Long live the flatpak ci

 .gitlab-ci.yml                   | 21 +--------------------
 build-aux/flatpak/local-build.sh | 14 --------------
 2 files changed, 1 insertion(+), 34 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc8f6422..668fbf98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,25 +67,6 @@ gtk-doc:
 flatpak:
     image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
     stage: build
-    only:
-        refs:
-            - master
-
-    before_script:
-        - dnf install -y flatpak-builder flatpak
-
-    script:
-        - ./build-aux/flatpak/local-build.sh
-
-    artifacts:
-        when: on_success
-        paths:
-        - build-aux/flatpak/org.gnome.Evince.flatpak
-        expire_in: 2 days
-
-flatpak-meson:
-    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-    stage: build
 
     variables:
         MANIFEST_PATH: "build-aux/flatpak/org.gnome.Evince.json"
@@ -118,7 +99,7 @@ deploy:
     stage: deploy
 
     dependencies:
-        - flatpak-meson
+        - flatpak
 
     script:
         - echo "Generating flatpak deployment"