summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2021-06-21 20:41:13 +0100
committerDaniel Stone <daniels@collabora.com>2021-08-03 11:13:23 +0000
commitdd6e88dc5c574d5139e7bf4717c2a36d6777f0ff (patch)
tree08b14bca3a4d347515a11cdafe68d24c40857617 /.gitlab-ci
parentd98e3dadd4ec818480c367a009a5c877e4013292 (diff)
downloadweston-dd6e88dc5c574d5139e7bf4717c2a36d6777f0ff.tar.gz
CI: Build wayland-protocols in container
Keep this as part of our container image; there's no reason to pull it for every single build. Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/debian-install.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 49640be9..d9bfa305 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -25,7 +25,6 @@ MESA_DEV_PKGS="
llvm-8-dev
python-mako
python3-mako
- wayland-protocols
"
# Needed for running the custom-built mesa
@@ -147,6 +146,16 @@ cd build
make install
cd ../../
+git clone --branch 1.19 https://gitlab.freedesktop.org/wayland/wayland-protocols
+cd wayland-protocols
+git show -s HEAD
+mkdir build
+cd build
+../autogen.sh
+make install
+cd ../../
+rm -rf wayland-protocols
+
apt-get -y --no-install-recommends install $MESA_DEV_PKGS
git clone --single-branch --branch 20.3 --shallow-since='2020-12-15' https://gitlab.freedesktop.org/mesa/mesa.git mesa
cd mesa