[gnome-usage: 6/6] Merge branch 'yodatak/gnome-usage-master' into HEAD

[Petr Štětka <pstetka src gnome org>]

commit 4eefa8f117dfaad028a5d58e5a6f9d69ccbb8f2e
Merge: 5f6cb40 43b019b
Author: Petr Štětka <pstetka redhat com>
Date:   Thu Jan 3 10:50:33 2019 +0100

    Merge branch 'yodatak/gnome-usage-master' into HEAD

 .gitlab-ci.yml | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)
---
diff --cc .gitlab-ci.yml
index 7972e70,b44fe22..8f06712
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1,11 -1,16 +1,17 @@@
- image: fedora:29
  stages:
    - build
- before_script:
-   - dnf update -y
-   - dnf install -y gcc meson gettext gtk-doc vala gtk3-devel libgtop2-devel
-                    desktop-file-utils libdazzle-devel
- build-gnome-usage:
+ 
+ variables:
+   BUNDLE: "org.gnome.Usage.Devel.flatpak"
+ 
+ 
+ 
+ build:
+   before_script:
+     - dnf update -y
 -    - dnf install -y gcc meson gettext gtk-doc vala gtk3-devel libgtop2-devel desktop-file-utils
 -  image: fedora:28
++    - dnf install -y gcc meson gettext gtk-doc vala gtk3-devel libgtop2-devel 
++                     desktop-file-utils libdazzle-devel
++  image: fedora:29
    stage: build
    script:
    - meson _build .