From a3cf7c6e7faa4db63085f332cf0b88f9e60f7375 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Fri, 1 Nov 2019 17:00:40 +0100 Subject: [PATCH] CI: build wayland from source The next commit bumps the required Wayland version beyond what the repo version supports. Build wayland 1.17 into the docker image. Signed-off-by: Sebastian Wick --- .gitlab-ci.yml | 2 +- .gitlab-ci/debian-install.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9620abef..1c21c6e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: DEBIAN_VERSION: buster DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' - DEBIAN_TAG: '2019-06-26.0' + DEBIAN_TAG: '2019-11-04.0' DEBIAN_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 06b3900b..80ba6e36 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -12,5 +12,15 @@ pip3 install sphinx==2.1.0 --user pip3 install breathe==4.13.0.post0 --user pip3 install sphinx_rtd_theme==0.4.3 --user +git clone --branch 1.17.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland +export MAKEFLAGS="-j4" +cd wayland +git show -s HEAD +mkdir build +cd build +../autogen.sh --disable-documentation +make install +cd ../../ + mkdir -p /tmp/.X11-unix chmod 777 /tmp/.X11-unix