diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-07-23 17:24:27 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-07-23 17:24:27 -0700 |
| commit | b4c024a1cf80b81f7f286873d5fc6877d34d2db6 (patch) | |
| tree | 531c71a3d1682c4c8074460d753182379d42aca9 | |
| parent | b3986884ccf82da894fa967c1f60a3336a5faf36 (diff) | |
gitlab CI: enable commit & merge request checks
Uses ci-fairy from freedesktop/ci-templates
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | .gitlab-ci.yml | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 198f3c8..fe0d2c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,8 @@ # vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml: +# +# This CI uses the freedesktop.org ci-templates. +# Please see the ci-templates documentation for details: +# https://freedesktop.pages.freedesktop.org/ci-templates/ .templates_sha: &template_sha 16f790f93f893394b70d7048fb0e8a981ceaa3c5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile @@ -6,13 +10,18 @@ include: - project: 'freedesktop/ci-templates' ref: *template_sha file: '/templates/debian.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' stages: - prep - install xserver - build + - test variables: + FDO_UPSTREAM_REPO: 'xorg/test/xorg-integration-tests' FDO_DISTRIBUTION_TAG: '2021-05-30.2' # change this to rebuild the images FDO_DISTRIBUTION_VERSION: 'stable' FDO_DISTRIBUTION_PACKAGES: 'git ca-certificates meson g++ pkgconf libpixman-1-dev xserver-xorg-input-wacom libx11-dev libxi-dev libxext-dev libxrandr-dev libxtst-dev libxxf86dga-dev libevdev-dev libevemu-dev' @@ -21,6 +30,40 @@ variables: NINJA_ARGS: '' MESON_ARGS: '' +# +# Verify that commit messages are as expected +# +check-commits: + extends: + - .fdo.ci-fairy + stage: prep + script: + - ci-fairy check-commits --junit-xml=results.xml + except: + - master@xorg/test/xorg-integration-tests + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + allow_failure: true + +# +# Verify that the merge request has the allow-collaboration checkbox ticked +# +check-merge-request: + extends: + - .fdo.ci-fairy + stage: test + script: + - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml + artifacts: + when: on_failure + reports: + junit: results.xml + allow_failure: true + + # We're using the X Server's meson build image as base image. This way we have # all the dependencies for building the actual server already installed and # don't need to worry about those. |