summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml49
1 files changed, 49 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 668aa2c..0ffe331 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,9 @@
+# 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: &templates_sha 567700e483aabed992d0a4fea84994a0472deff6
include:
@@ -6,6 +12,9 @@ include:
ref: *templates_sha
file:
- 'templates/fedora.yml'
+ - project: 'freedesktop/ci-templates'
+ ref: *templates_sha
+ file: '/templates/ci-fairy.yml'
# global variables to be used by most/all jobs.
variables:
@@ -18,7 +27,47 @@ variables:
stages:
- prep
- build
+ - test
+
+#
+# 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/proto/xcbproto
+ 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@fedora