From: Stefan Agner Date: Sun, 20 Oct 2019 15:19:03 +0000 (+0200) Subject: gitlab-ci: add build configuration without gl-renderer X-Git-Tag: upstream/9.0.0~335 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a0706b238987bf3dcf7dde54556850ee88ccdba;p=platform%2Fupstream%2Fweston.git gitlab-ci: add build configuration without gl-renderer Building without gl-renderer seems to fail rather often. Introduce a specific build job which tests this configuration. Make use of the Folded Block Scalar in YAML to concatenate the build option string with spaces. This will make diffing build option changes very readable. Signed-off-by: Stefan Agner --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d369e5ff..e7f2a0f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,12 +47,12 @@ container_prep: - export BUILDDIR="$(pwd)/build-$BUILD_ID" - mkdir "$BUILDDIR" "$PREFIX" -build-native-meson: +.build-native-meson: extends: .build-native script: - export PATH=~/.local/bin:$PATH - cd "$BUILDDIR" - - meson --prefix="$PREFIX" -Dsimple-dmabuf-drm=intel -Dwerror=true -Ddoc=true .. + - meson --prefix="$PREFIX" ${MESON_OPTIONS} .. - ninja -k0 - ninja install - ninja test @@ -64,10 +64,28 @@ build-native-meson: - build-*/meson-logs - prefix-* +build-native-meson-default-options: + variables: + MESON_OPTIONS: > + -Dsimple-dmabuf-drm=intel + -Dwerror=true + -Ddoc=true + extends: .build-native-meson + +build-native-meson-no-gl-renderer: + variables: + MESON_OPTIONS: > + -Dsimple-dmabuf-drm=intel + -Dsimple-clients=damage,im,shm,touch,dmabuf-v4l + -Drenderer-gl=false + -Dremoting=false + -Dwerror=true + extends: .build-native-meson + pages: stage: pages dependencies: - - build-native-meson + - build-native-meson-default-options script: - export PREFIX=$(pwd)/prefix-weston-build-native-meson - mkdir public