diff options
author | Michel Dänzer <mdaenzer@redhat.com> | 2020-02-10 18:48:05 +0100 |
---|---|---|
committer | Michel Dänzer <michel@daenzer.net> | 2020-02-11 15:59:18 +0100 |
commit | 1310346d6052c91910f526cbdcc81061fe6abd94 (patch) | |
tree | 53ae80f6be55f4314bb8bbe266794e085020acaa /.gitlab-ci.yml | |
parent | 72ccd7f540a36185ecdb62324c68496fb57e65fe (diff) |
gitlab-ci: Add meson build job with glamor disabled
To prevent breakage with glamor disabled from creeping in again.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5eb300da9..1b82083d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,7 +81,13 @@ meson: PIGLIT_DIR: /root/piglit XTEST_DIR: /root/xts script: - - meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true build/ + - meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/ - ninja -j4 -C build/ install - ninja -j4 -C build/ test - .gitlab-ci/manpages-check + +meson-noglamor: + extends: meson + variables: + MESON_EXTRA_OPTIONS: > + -Dglamor=false |