[nautilus] CI: Use only Flatpak build for MR's

[Carlos Soriano <csoriano src gnome org>]

commit 2172bb0558cde70e231921ccecd411d0d44ce959
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Sat Mar 17 23:16:06 2018 +0000

    CI: Use only Flatpak build for MR's
    
    So everyone uses the same environment, including the CI.
    
    Distributions will be tested weekly.

 .gitlab-ci.yml | 74 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1ca0e622..8fef41b1d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,44 @@
 stages:
 - test
 - cross_distro
-
-fedora:stable:
-    image: fedora:28
+      
+flatpak:master:
+    image: flatpak/flatpak-builder:gnome-3-28
     stage: test
     script:
-    - dnf install -y gcovr 'dnf-command(builddep)' redhat-rpm-config git
+    # This should be removed once the base image works with git submodules
+    - dnf install -y git
+    - flatpak-builder --force-clean --keep-build-dirs --repo=repo app 
build-aux/flatpak/org.gnome.Nautilus.json
+    # Make a Flatpak Nautilus bundle for people to test
+    - flatpak build-bundle repo nautilus-dev.flatpak org.gnome.Nautilus
+    # Run automatic tests inside the Flatpak env
+    - flatpak-builder --run app build-aux/flatpak/org.gnome.Nautilus.json sh
+    - cd /run/build/nautilus/_flatpak_build
+    - ninja test
+    artifacts:
+        paths:
+          - nautilus-dev.flatpak
+        expire_in: 2 days
+    artifacts:
+        when: on_failure
+        paths:
+        - .flatpak-builder/build/nautilus/_flatpak_build/meson-logs/meson-log.txt
+        - .flatpak-builder/build/nautilus/_flatpak_build/meson-logs/testslog.txt
+
+# Pick any distro to build the coverage
+fedora:rawhide:
+    image: fedora:rawhide
+    stage: cross_distro
+    script:
+    - dnf install -y 'dnf-command(builddep)' redhat-rpm-config gcovr
+    # Waiting for gcovr 3.5 to be released.
+    - pip install git+https://github.com/gcovr/gcovr.git
     - dnf builddep -y nautilus
+    - meson _build . -Db_coverage=true
     # Coverage data contains paths relative to the build directory,
     # so changing to it makes writing filter expressions easier.
     #
     # _build/src/ contains generated sources, so that is filtered out as well.
-    # Waiting for gcovr 3.5 to be released.
-    - pip install git+https://github.com/gcovr/gcovr.git
-    - meson _build . -Db_coverage=true
     - cd _build
     - ninja test
     - gcovr --root=.
@@ -31,39 +55,9 @@ fedora:stable:
         --exclude=../subprojects/libgd/
         --exclude=../test/
     coverage: '/^TOTAL.*\s+(\d+\%)$/'
-    artifacts:
-        when: on_failure
-        paths:
-        - meson-logs/meson-log.txt
-        - meson-logs/testslog.txt
-
-      
-flatpak:master:
-    image: flatpak/flatpak-builder:gnome-3-28
-    stage: test
-    script:
-    # This should be removed once the base image works with git submodules
-    - dnf install -y git
-    - flatpak-builder --force-clean --repo=repo app build-aux/flatpak/org.gnome.Nautilus.json
-    - flatpak build-bundle repo nautilus-dev.flatpak org.gnome.Nautilus
-    artifacts:
-        paths:
-          - nautilus-dev.flatpak
-        expire_in: 2 days
-
-    
-fedora:rawhide:
-    image: fedora:rawhide
-    stage: cross_distro
-    script:
-    - dnf install -y 'dnf-command(builddep)' redhat-rpm-config
-    - dnf builddep -y nautilus
-    - meson _build .
-    - cd _build
-    - ninja test
     only:
     - schedules
-    
+
 ubuntu:devel:
     image: ubuntu:devel
     stage: cross_distro
@@ -81,7 +75,7 @@ ubuntu:devel:
     - ninja test
     only:
     - schedules
-    
+
 opensuse:tumbleweed:
     image: opensuse:tumbleweed
     stage: cross_distro
@@ -94,4 +88,4 @@ opensuse:tumbleweed:
     - cd _build
     - ninja test
     only:
-    - schedules
+    - schedules
\ No newline at end of file