[nautilus/wip/ernestask/leak-plugging] Flatpak: Switch to 3.30 runtime

[Ernestas Kulik <ernestask src gnome org>]

commit 0c449d5c5f27cd1b6825e3a4bb5969a5934c5106
Author: Ernestas Kulik <ernestask gnome org>
Date:   Sat Oct 6 12:26:19 2018 +0300

    Flatpak: Switch to 3.30 runtime

 .gitlab-ci.yml                           |  7 ++++---
 build-aux/flatpak/org.gnome.Nautilus.yml | 17 ++---------------
 2 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b46268e84..ab2a20c6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,11 +14,11 @@ stages:
       - ninja test
 
 flatpak:
-    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.28
+    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30
     stage: test
     variables:
         MANIFEST_PATH: "build-aux/flatpak/org.gnome.Nautilus.yml"
-        MESON_ARGS: "-Dprofile=development -Dtests=all"
+        MESON_ARGS: "-Dprofile=Devel -Dtests=all"
         FLATPAK_MODULE: "nautilus"
         RUNTIME_REPO: "https://sdk.gnome.org/gnome.flatpakrepo";
         DBUS_ID: "org.gnome.NautilusDevel"
@@ -33,13 +33,14 @@ flatpak:
         - flatpak build app ninja -C _build install
         - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
         # Run automatic tests inside the Flatpak env
-        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
+        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app meson test -C _build
         # Generate a Flatpak bundle
         - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
     artifacts:
         paths:
             - ${BUNDLE}
             - _build/meson-logs/
+        when: always
         expire_in: 30 days
     cache:
         paths:
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 1f4109c09..471187e0e 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -1,6 +1,6 @@
 app-id: org.gnome.NautilusDevel
 runtime: org.gnome.Platform
-runtime-version: 3.28
+runtime-version: 3.30
 sdk: org.gnome.Sdk
 command: nautilus
 tags:
@@ -25,15 +25,6 @@ finish-args:
   - --env=TRACKER_SPARQL_BACKEND=bus
 
 modules:
-  - name: meson
-    buildsystem: simple
-    build-commands:
-      - python3 setup.py install --prefix=/app
-    sources:
-      - type: git
-        url: https://github.com/mesonbuild/meson.git
-        tag: 0.47.2
-
   - name: exiv2
     buildsystem: cmake
     build-options:
@@ -44,10 +35,6 @@ modules:
       - type: archive
         url: https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz
         sha256: 51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01
-      - type: shell
-        commands:
-          - cp -f /usr/share/automake-1.15/config.sub ./config/
-          - cp -f /usr/share/automake-1.15/config.guess ./config/
 
   - name: gexiv2
     buildsystem: meson
@@ -97,4 +84,4 @@ modules:
         - -Dprofile=development
     sources:
       - type: git
-        url: https://gitlab.gnome.org/GNOME/nautilus.git
\ No newline at end of file
+        url: https://gitlab.gnome.org/GNOME/nautilus.git