diff options
| author | Simon Ser <contact@emersion.fr> | 2022-01-19 10:57:59 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-02-23 07:40:03 +0000 |
| commit | 7e2d9e381e32c99a1d9f054ab460398c9141f8e5 (patch) | |
| tree | 0472b0979e62da3f971cad4b2ca7fde29b6f75a8 | |
| parent | 4cc189f2a05b94255c61584f1d0c38ca385c5cd3 (diff) | |
ci: upgrade wayland to 1.20.0
This will be useful to use features introduced in wayland 1.20,
e.g. event destructors.
Signed-off-by: Simon Ser <contact@emersion.fr>
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rwxr-xr-x | .gitlab-ci/debian-install.sh | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0cd9de..cff93c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,8 +19,9 @@ variables: .debian: variables: FDO_DISTRIBUTION_VERSION: bullseye - FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config libwayland-dev meson' - FDO_DISTRIBUTION_TAG: '2021-11-09.0' + FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config meson git ca-certificates libffi-dev libexpat1-dev libxml2-dev' + FDO_DISTRIBUTION_TAG: '2022-01-19.0' + FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} ./.gitlab-ci/debian-install.sh' check-commit: extends: diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh new file mode 100755 index 0000000..256d665 --- /dev/null +++ b/.gitlab-ci/debian-install.sh @@ -0,0 +1,14 @@ +#!/bin/sh -eux + +# Note: don't forget to bump FDO_DISTRIBUTION_TAG when editing this file! + +git clone --branch 1.20.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland +cd wayland/ +git show -s HEAD +meson build/ -Dtests=false -Ddocumentation=false +ninja -j${FDO_CI_CONCURRENT:-4} -C build/ install +cd .. +rm -rf wayland/ + +echo "/usr/local/lib" >/etc/ld.so.conf.d/local.conf +ldconfig |