frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Bump to wayland-protocols 1.28 for xwayland_shell 

Debian Bullseye only has 1.20, so we need to bump this.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Joshua Ashton 2022-11-10 05:04:53 +00:00
parent 7c5bb5e9c5
commit d1fbee9cf5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -19,7 +19,7 @@ variables:
FDO_UPSTREAM_REPO: xorg/xserver FDO_UPSTREAM_REPO: xorg/xserver
FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_DISTRIBUTION_VERSION: bullseye-slim
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
FDO_DISTRIBUTION_TAG: "2022-09-02-fixed-commits" FDO_DISTRIBUTION_TAG: "2022-11-24-new-wayland-protocols"
include: include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'

8
.gitlab-ci/debian-install.sh
View File

@ -137,11 +137,11 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
cd .. cd ..
rm -rf wayland rm -rf wayland
# Xwayland requires wayland-protocols >= 1.22, but Debian bullseye has 1.20 only # Xwayland requires wayland-protocols >= 1.28, but Debian bullseye has 1.20 only
git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.22 git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.28
cd wayland-protocols cd wayland-protocols
./autogen.sh meson _build
make -j${FDO_CI_CONCURRENT:-4} install ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
cd .. cd ..
rm -rf wayland-protocols rm -rf wayland-protocols