summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2022-12-04 12:07:40 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2022-12-04 12:26:26 -0800
commitbb02359ff464d51cbb29d3c93e7e55f3649e5b91 (patch)
tree58a574473c02b6fca806641126d18ed2945e5abe
parent6e541c8fa782ca816f8bf78a54eea27dab27e4a2 (diff)
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>
-rw-r--r--.gitlab-ci.yml29
1 files changed, 27 insertions, 2 deletions
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