diff options
| author | Joshua Ashton <joshua@froggi.es> | 2022-11-10 05:04:53 +0000 |
|---|---|---|
| committer | Joshua Ashton <joshua@froggi.es> | 2022-12-21 11:03:20 +0000 |
| commit | d1fbee9cf5dcf47a195eec6d56dd1cc720835ecf (patch) | |
| tree | 0450e10528c3e027194452779be19382f64198a7 | |
| parent | 7c5bb5e9c590f0ae4d45da757d66714ce06025f8 (diff) | |
| download | xserver-d1fbee9cf5dcf47a195eec6d56dd1cc720835ecf.tar.gz | |
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>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1b584a57..45f090ffc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: FDO_UPSTREAM_REPO: xorg/xserver FDO_DISTRIBUTION_VERSION: bullseye-slim 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: - project: 'freedesktop/ci-templates' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 8c74c387c..5fca4c625 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -137,11 +137,11 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install cd .. rm -rf wayland -# Xwayland requires wayland-protocols >= 1.22, but Debian bullseye has 1.20 only -git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.22 +# 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.28 cd wayland-protocols -./autogen.sh -make -j${FDO_CI_CONCURRENT:-4} install +meson _build +ninja -C _build -j${FDO_CI_CONCURRENT:-4} install cd .. rm -rf wayland-protocols |