From dd6e88dc5c574d5139e7bf4717c2a36d6777f0ff Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Mon, 21 Jun 2021 20:41:13 +0100
Subject: [PATCH] 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>
---
 .gitlab-ci.yml               | 13 +------------
 .gitlab-ci/debian-install.sh | 11 ++++++++++-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8deb29b..cce99991 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ stages:
   variables:
     FDO_DISTRIBUTION_VERSION: buster
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
-    FDO_DISTRIBUTION_TAG: '2021-07-31.0-pipewire'
+    FDO_DISTRIBUTION_TAG: '2021-07-31.1-wayland-protocols'
 
 .ci-rules:
   rules:
@@ -70,17 +70,6 @@ container_prep:
     BUILDDIR: $CI_PROJECT_DIR/build-weston-$CI_JOB_NAME
     PREFIX: $CI_PROJECT_DIR/prefix-weston-$CI_JOB_NAME
   before_script:
-  - git clone --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols
-  - export WAYLAND_PROTOCOLS_DIR="$(pwd)/prefix-wayland-protocols"
-  - export PKG_CONFIG_PATH="$WAYLAND_PROTOCOLS_DIR/share/pkgconfig:$PKG_CONFIG_PATH"
-  - export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}"
-  - cd wayland-protocols
-  - git show -s HEAD
-  - mkdir build
-  - cd build
-  - ../autogen.sh --prefix="$WAYLAND_PROTOCOLS_DIR"
-  - make install
-  - cd ../../
   - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
   - export TESTS_RES_PATH="$BUILDDIR/tests-res.txt"
   - mkdir "$BUILDDIR" "$PREFIX"
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