summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mader <robert.mader@collabora.com>2023-03-01 23:07:52 +0100
committerRobert Mader <robert.mader@posteo.de>2023-03-31 10:08:36 +0000
commit1d2feda5aa18a7dc309e901d6866a9c729eea2c6 (patch)
tree4dd9952685f61c889e939d1bdb0ce23d069523fd
parent06b57e1dda535c1a4737d937e5859a0541bcb5f8 (diff)
downloadweston-1d2feda5aa18a7dc309e901d6866a9c729eea2c6.tar.gz
gitlab-ci.yml: Bump wayland-protocols to 1.31
It contains the new fractional-scale protocol. Signed-off-by: Robert Mader <robert.mader@collabora.com>
-rw-r--r--.gitlab-ci.yml2
-rwxr-xr-x.gitlab-ci/build-deps.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 347d22d9..d5603f9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@
variables:
FDO_UPSTREAM_REPO: wayland/weston
FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
- FDO_DISTRIBUTION_TAG: '2023-02-28-libxcb-migration'
+ FDO_DISTRIBUTION_TAG: '2023-03-03-bump-wayland-protocols-to-1.31'
include:
diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh
index a4a0e041..47149e24 100755
--- a/.gitlab-ci/build-deps.sh
+++ b/.gitlab-ci/build-deps.sh
@@ -105,7 +105,7 @@ rm -rf wayland
# Keep this version in sync with our dependency in meson.build. If you wish to
# raise a MR against custom protocol, please change this reference to clone
# your relevant tree, and make sure you bump $FDO_DISTRIBUTION_TAG.
-git clone --branch 1.30 --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols
+git clone --branch 1.31 --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols
cd wayland-protocols
git show -s HEAD
meson build