diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-07-23 17:13:51 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-07-23 17:13:51 -0700 |
| commit | 169505ec7a5ea04fd3e5b18eafa190cdb35ff163 (patch) | |
| tree | 972a4b002afdd66f3e8d1fa8e4442a918d4d5dbf | |
| parent | f29b408724e9c41f33673a6f975bb4299bfaebb7 (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 | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0aee1fa..eb71f91 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,16 +10,60 @@ 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 - build + - test variables: + FDO_UPSTREAM_REPO: 'xorg/test/xorg-gtest' FDO_DISTRIBUTION_TAG: '2020-11-30.0' # change this to rebuild the images FDO_DISTRIBUTION_VERSION: 'stable' FDO_DISTRIBUTION_PACKAGES: 'meson g++ pkgconf libevemu-dev libevdev-dev libx11-dev libxi-dev libxext-dev' +# +# 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-gtest + 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 + + +# +# Build a container with the given tag and the packages pre-installed. +# This only happens if/when the tag changes, otherwise the existing image is +# re-used. +# container-prep: extends: - .fdo.container-build@debian |