[cairo-commit] 2 commits - .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fda1f07bdf8cc187eb81b0cb877e394ef74bdfaa
Merge: 3e5115fde 5d97c1285
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Nov 17 17:24:05 2020 +0000

    Merge branch 'meson-ci-require-gl-on-fedora' into 'master'
    
    ci: require opengl in meson fedora build
    
    See merge request cairo/cairo!79

commit 5d97c12859fefca943e630ee5739ae5bf185099b
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Tue Nov 17 16:55:47 2020 +0000

    ci: require opengl in meson fedora build
    
    Follow-up to !78

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f67f240c..d125c7b08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,8 +110,12 @@ fedora meson build:
     - '.fdo.distribution-image at fedora'
     - '.ccache_setup'
   stage: 'test'
+  variables:
+    MESON_ARGS: >
+      ${DEFAULT_MESON_ARGS}
+      -Dgl-backend=gl
   script:
-    - meson builddir
+    - meson builddir ${MESON_ARGS}
     - ninja -C builddir
     # - ninja -C builddir test
     - ninja -C builddir install