summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml43
1 files changed, 43 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a2f4d2..0cc68ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,15 @@ 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 xorgproto
- build
+ - deploy
variables:
FDO_DISTRIBUTION_TAG: '2021-05-30.8' # change this to rebuild the images
@@ -22,6 +26,45 @@ 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/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: deploy
+ 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