xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

New commits:
commit dc5194bb5a7148d29e6453bed6e125b34d45379a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jul 23 15:07:53 2022 -0700

    gitlab CI: enable commit & merge request checks
    
    Uses ci-fairy from freedesktop/ci-templates
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8eb156d3..9fec8d347 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,11 @@
+# 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
+
 # FDO_DISTRIBUTION_TAG is the tag of the docker image used for the build jobs.
 # If the image doesn't exist yet, the docker-image stage generates it.
 #
@@ -15,8 +23,11 @@ variables:
 
 include:
   - project: 'freedesktop/ci-templates'
-    ref: 4f06663cd1507136a0f8440925a2521098adb298
+    ref: *template_sha
     file: '/templates/debian.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
   - template: Security/SAST.gitlab-ci.yml
 
 stages:
@@ -86,3 +97,36 @@ mingw-cross-build:
     script:
         - meson --cross-file=.gitlab-ci/cross-i686-w64-mingw32.txt -Dglx=false -Dsecure-rpc=false -Dlisten_tcp=true build/
         - ninja -j${FDO_CI_CONCURRENT:-4} -C build/ install
+
+#
+# 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 at xorg/xserver
+  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
commit f26c7265ec0ca40458a3e2c5e387094607a43fa6
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jul 23 15:03:00 2022 -0700

    gitlab CI: enable gitlab's builtin static analysis
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92b023913..b8eb156d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,12 @@ include:
   - project: 'freedesktop/ci-templates'
     ref: 4f06663cd1507136a0f8440925a2521098adb298
     file: '/templates/debian.yml'
+  - template: Security/SAST.gitlab-ci.yml
 
 stages:
     - docker-image
     - build-and-test
+    - test
 
 .ci-run-policy:
   # Retry jobs after runner system failures