fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2025-12-27 02:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: ensure docs can be generated too

Browse source 
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/285>
This commit is contained in:
Alan Coopersmith 2025-06-28 14:34:31 -07:00
parent 7f8305c779
commit 8a32fad341
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
.gitlab-ci.yml
View file

@ -20,6 +20,7 @@ include:
stages: stages:
- prep # prep work like rebuilding the container images if there is a change - prep # prep work like rebuilding the container images if there is a change
- install-doctools
- build # for actually building and testing things in a container - build # for actually building and testing things in a container
- test - test
- deploy - deploy
@ -30,8 +31,8 @@ variables:
# The tag should be updated each time the list of packages is updated. # The tag should be updated each time the list of packages is updated.
# Changing a tag forces the associated image to be rebuilt. # Changing a tag forces the associated image to be rebuilt.
# Note: the tag has no meaning, we use a date format purely for readability # Note: the tag has no meaning, we use a date format purely for readability
FDO_DISTRIBUTION_TAG: '2023-02-06.1' FDO_DISTRIBUTION_TAG: '2025-06-28.0'
FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xorg-util-macros xtrans xorgproto libxcb' FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xmlto libxslt docbook-xml docbook-xsl xorg-util-macros xtrans xorgproto libxcb'
# #
@ -80,6 +81,28 @@ container-prep:
GIT_STRATEGY: none GIT_STRATEGY: none
# Install xorg-sgml-doctools from git, since Arch doesn't package it
install-doctools:
extends:
- .fdo.distribution-image@arch
stage: install-doctools
script:
- export INSTDIR="$PWD/_inst"
- git clone --depth=1 https://gitlab.freedesktop.org/xorg/doc/xorg-sgml-doctools
- pushd xorg-sgml-doctools > /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. # The default build, runs on the image built above.
# #
@ -88,14 +111,19 @@ build:
extends: extends:
- .fdo.distribution-image@arch - .fdo.distribution-image@arch
script: script:
- export INSTDIR="$PWD/_inst"
- export PKG_CONFIG_PATH="$INSTDIR/share/pkgconfig"
- autoreconf -ivf - autoreconf -ivf
- mkdir _builddir - mkdir _builddir
- pushd _builddir > /dev/null - pushd _builddir > /dev/null
- ../configure --disable-silent-rules - ../configure --disable-silent-rules --prefix="$INSTDIR" --enable-specs
- make - make
- make check - make check
- make distcheck - make distcheck
- popd > /dev/null - popd > /dev/null
artifacts:
paths:
- _inst
# #
# Workflow rules needed due to: # Workflow rules needed due to: