diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-07-17 12:22:50 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-07-17 12:22:50 -0700 |
| commit | 185a91c6e7f7e40d916f0554df2aceb73509fd52 (patch) | |
| tree | 7c48c139e1d8bcc3b1c10b0c6460fa7a33174899 | |
| parent | 8570239e74569411dc8c470e687c9ca042746cb5 (diff) | |
gitlab CI: enable doc builds in basic build test
Also drops requirement for Signed-off-by in commit checks
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a17ce4..cd211ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,10 +8,10 @@ include: - # Arch container builder template + # Debian container builder template - project: 'freedesktop/ci-templates' ref: *template_sha - file: '/templates/arch.yml' + file: '/templates/debian.yml' - project: 'freedesktop/ci-templates' ref: *template_sha file: '/templates/ci-fairy.yml' @@ -27,22 +27,23 @@ stages: variables: FDO_UPSTREAM_REPO: 'xorg/lib/libXdmcp' + FDO_DISTRIBUTION_VERSION: 'stable' # 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-02-23.0' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto' + FDO_DISTRIBUTION_TAG: '2022-06-10.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev x11proto-dev libx11-dev xmlto xorg-sgml-doctools w3m xsltproc fop' # -# Verify that commit messages are as expected, signed-off, etc. +# Verify that commit messages are as expected # check-commits: extends: - .fdo.ci-fairy stage: prep script: - - ci-fairy check-commits --signed-off-by --junit-xml=results.xml + - ci-fairy check-commits --junit-xml=results.xml except: - master@xorg/lib/libXdmcp variables: @@ -74,7 +75,7 @@ check-merge-request: # container-prep: extends: - - .fdo.container-build@arch + - .fdo.container-build@debian stage: prep variables: GIT_STRATEGY: none @@ -86,12 +87,12 @@ container-prep: build: stage: build extends: - - .fdo.distribution-image@arch + - .fdo.distribution-image@debian script: - autoreconf -ivf - mkdir _builddir - pushd _builddir > /dev/null - - ../configure --disable-silent-rules --enable-unit-tests + - ../configure --disable-silent-rules --enable-docs --enable-unit-tests - make - make check - make distcheck |