summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2022-07-23 16:51:29 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2022-07-23 16:58:19 -0700
commit925903018f73807a09c812a7500770bfb9e56a55 (patch)
treee0801c60ad75e213d37e619049d191c1d1972ded
parentdfc5e204268473b89c1b93075595182750fe4bea (diff)
downloadxorg-driver-xf86-input-libinput-925903018f73807a09c812a7500770bfb9e56a55.tar.gz
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.yml51
1 files changed, 46 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69ec08c..4005637 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,27 @@
-# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0:
+# 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 c5626190ec14b475271288dda7a7dae8dbe0cd76 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include:
- project: 'freedesktop/ci-templates'
- ref: 59de540b620c45739871d1a073d76d5521989d11 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+ ref: *template_sha
file: '/templates/fedora.yml'
-
+ - project: 'freedesktop/ci-templates'
+ ref: *template_sha
+ file: '/templates/ci-fairy.yml'
variables:
- FDO_UPSTREAM_REPO: xorg/drivers/xf86-input-libinput
+ FDO_UPSTREAM_REPO: xorg/driver/xf86-input-libinput
stages:
- containers
- build
-
+ - test
.fedora:
variables:
@@ -54,3 +62,36 @@ fedora:33@default-build:
- .fedora
- .fdo.distribution-image@fedora
- .default_build
+
+#
+# Verify that commit messages are as expected
+#
+check-commits:
+ extends:
+ - .fdo.ci-fairy
+ stage: test
+ script:
+ - ci-fairy check-commits --junit-xml=results.xml
+ except:
+ - master@xorg/driver/xf86-input-libinput
+ 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