From bb02359ff464d51cbb29d3c93e7e55f3649e5b91 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 4 Dec 2022 12:07:40 -0800
Subject: gitlab CI: build current libICE, to meet dependency on >= 1.1.0

Allow us to pass CI without waiting for Debian to pick up yesterday's
release of libICE 1.1.0.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 .gitlab-ci.yml | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 638a71b..e47b08c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ include:
 
 stages:
   - prep             # prep work like rebuilding the container images if there is a change
+  - install libice
   - build            # for actually building and testing things in a container
   - test
   - deploy
@@ -31,8 +32,8 @@ variables:
   # The tag should be updated each time the list of packages is updated.
   # Changing a tag forces the associated image to be rebuilt.
   # Note: the tag has no meaning, we use a date format purely for readability
-  FDO_DISTRIBUTION_TAG:  '2022-03-05.4'
-  FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev  x11proto-dev xtrans-dev libice-dev uuid-dev xmlto xorg-sgml-doctools w3m xsltproc fop'
+  FDO_DISTRIBUTION_TAG:  '2022-12-04.0'
+  FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev x11proto-dev xtrans-dev libbsd-dev uuid-dev xmlto xorg-sgml-doctools w3m xsltproc fop'
 
 
 #
@@ -81,6 +82,28 @@ container-prep:
     GIT_STRATEGY: none
 
 
+# Install latest version of libICE, since debian doesn't package 1.1.0 yet
+libice-build:
+  extends:
+    - .fdo.distribution-image@debian
+  stage: install libice
+  script:
+    - export INSTDIR="$PWD/_inst"
+    - git clone --depth=1 https://gitlab.freedesktop.org/xorg/lib/libice
+    - pushd libice > /dev/null
+    - autoreconf -ivf
+    - mkdir _builddir
+    - pushd _builddir > /dev/null
+    - ../configure --disable-silent-rules --prefix="$INSTDIR"
+    - make
+    - make install
+    - popd > /dev/null
+    - popd > /dev/null
+  variables:
+  artifacts:
+    paths:
+      - _inst
+
 #
 # The default build, runs on the image built above.
 #
@@ -89,6 +112,8 @@ build:
   extends:
     - .fdo.distribution-image@debian
   script:
+    - export INSTDIR="$PWD/_inst"
+    - export PKG_CONFIG_PATH=$(find $INSTDIR/ -name '*.pc' -printf "%h:")
     - autoreconf -ivf
     - mkdir _builddir
     - pushd _builddir > /dev/null
-- 
cgit v1.2.1