[Spice-devel] [PATCH spice-server 2/3] Update gitlab-ci to use meson

Eduardo Lima (Etrunko) etrunko at redhat.com
Fri Apr 27 19:25:39 UTC 2018


Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
 .gitlab-ci.yml | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 655232c2..52851ca6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,14 @@
 image: fedora:latest
 
 before_script:
+  - dnf -y install 'dnf-command(copr)' 'dnf-command(config-manager)'
+  - dnf config-manager --set-enabled updates-testing
   - >
-    dnf install 'dnf-command(copr)' git libtool make libasan orc-devel
-    python3 python3-six python3-pyparsing glib-networking
-    -y
+    dnf -y install git libtool make libasan orc-devel python3 python3-six
+    python3-pyparsing meson python3-devel glib-networking ninja-build
   - dnf copr enable @spice/nightly -y
   - dnf builddep spice -y
+  - ln -sf /usr/bin/python3 /usr/bin/python #FIXME?
 
 makecheck:
   script:
@@ -17,6 +19,12 @@ makecheck:
   - make
   - make -C server check || (cat server/tests/test-suite.log && exit 1)
 
+meson-makecheck:
+  script:
+  - meson build
+  - ninja -C build
+  - cd build && meson test # || (cat server/tests/test-suite.log && exit 1)
+
 # check non-standard options, currently
 # --enable-statistics  compile statistic code
 # --without-sasl       disable SASL
@@ -26,6 +34,12 @@ options:
   - make
   - make -C server check || (cat server/tests/test-suite.log && exit 1)
 
+meson-options:
+  script:
+  - meson -Dstatistics=true -Dsasl=false build
+  - ninja -C build
+  - cd build && meson test # || (cat server/tests/test-suite.log && exit 1)
+
 check-valgrind:
   script:
   - dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm -y
@@ -40,6 +54,18 @@ check-valgrind:
   - make
   - make check-valgrind || (cat server/tests/test-suite-memcheck.log && exit 1)
 
+meson-check-valgrind:
+  script:
+  - dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm -y
+  - dnf debuginfo-install spice-server glib2 -y
+  - >
+    dnf install valgrind
+    gstreamer1-libav gstreamer1-plugins-ugly gstreamer1-plugins-good gstreamer1-plugins-bad-free
+    -y
+  - meson -Dextra-checks=true build
+  - ninja -C build
+  - cd build && meson test --wrap=valgrind # || (cat server/tests/test-suite-memcheck.log && exit 1)
+
 syntax-check:
   script:
   - ./autogen.sh
-- 
2.14.3



More information about the Spice-devel mailing list