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 <stefan@agner.ch>
dev
Stefan Agner 5 years ago committed by Pekka Paalanen
parent 88c8f69a2f
commit 5a0706b238
  1. 24
      .gitlab-ci.yml

@ -47,12 +47,12 @@ container_prep:
- export BUILDDIR="$(pwd)/build-$BUILD_ID" - export BUILDDIR="$(pwd)/build-$BUILD_ID"
- mkdir "$BUILDDIR" "$PREFIX" - mkdir "$BUILDDIR" "$PREFIX"
build-native-meson: .build-native-meson:
extends: .build-native extends: .build-native
script: script:
- export PATH=~/.local/bin:$PATH - export PATH=~/.local/bin:$PATH
- cd "$BUILDDIR" - cd "$BUILDDIR"
- meson --prefix="$PREFIX" -Dsimple-dmabuf-drm=intel -Dwerror=true -Ddoc=true .. - meson --prefix="$PREFIX" ${MESON_OPTIONS} ..
- ninja -k0 - ninja -k0
- ninja install - ninja install
- ninja test - ninja test
@ -64,10 +64,28 @@ build-native-meson:
- build-*/meson-logs - build-*/meson-logs
- prefix-* - 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: pages:
stage: pages stage: pages
dependencies: dependencies:
- build-native-meson - build-native-meson-default-options
script: script:
- export PREFIX=$(pwd)/prefix-weston-build-native-meson - export PREFIX=$(pwd)/prefix-weston-build-native-meson
- mkdir public - mkdir public

Loading…
Cancel
Save