summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.com>2019-12-11 13:12:52 +0200
committerPekka Paalanen <pekka.paalanen@collabora.com>2019-12-13 11:37:40 +0200
commitaaf8bfc0d338b74f7d58fd21a341f8f2baa33bcb (patch)
treec48fd61c80c61d4896431168b9395bfc8b911128
parent2db20b102716cd9c1e3523bd04f987bc9ce1a933 (diff)
downloadweston-aaf8bfc0d338b74f7d58fd21a341f8f2baa33bcb.tar.gz
weston-aaf8bfc0d338b74f7d58fd21a341f8f2baa33bcb.tar.bz2
weston-aaf8bfc0d338b74f7d58fd21a341f8f2baa33bcb.zip
gitlab-ci: install xwayland
The reason the Xwayland test skips is that Xwayland was not installed. We should exercise Xwayland as well in CI, so install it. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/debian-install.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de318ce4..dee26b62 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-11-04.0'
+ DEBIAN_TAG: '2019-12-13.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 5bccc2b5..accbf1fd 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -56,6 +56,7 @@ apt-get -y --no-install-recommends install \
pkg-config \
python3-pip \
python3-setuptools \
+ xwayland \
pip3 install --user git+https://github.com/mesonbuild/meson.git@0.49