[gnome-desktop/wip/fmuellner/meson: 39/40] ci: Switch build to meson



commit 05eafef529edb3f4bedf12e7d93d55fea8f41fd4
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Aug 2 14:22:13 2018 +0200

    ci: Switch build to meson
    
    It is faster and it needs the extra testing.
    
    https://gitlab.gnome.org/GNOME/gnome-desktop/merge_requests/7

 .gitlab-ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cebf6e51..7bc0ef65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
                 gtk-doc xkeyboard-config-devel intltool itstool
                 gobject-introspection-devel systemd-devel iso-codes-devel
                 libseccomp-devel gcc gcc-c++ glibc-devel gnome-common
-                make redhat-rpm-config
+                meson redhat-rpm-config
   TEST_DEPENDENCIES: gnome-desktop-testing xorg-x11-server-Xvfb glibc-langpack-he
 
 build_stable:
@@ -18,12 +18,11 @@ build_stable:
     - dnf install -y --nogpgcheck $DEPENDENCIES
     - dnf install -y --nogpgcheck $TEST_DEPENDENCIES
   script:
-    - mkdir build
+    - meson --prefix=/usr -Dinstalled_tests=true build
     - cd build
-    - ../autogen.sh --disable-dependency-tracking --enable-installed-tests --prefix=/usr
-    - make
-    - make install
-    - make check
+    - ninja
+    - ninja install
+    - xvfb-run -a -s "-screen 0 1024x768x24" ninja test
     - xvfb-run -a -s "-screen 0 1024x768x24"
                      gnome-desktop-testing-runner --report-directory=test-results gnome-desktop
   artifacts:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]