xorgproto: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

New commits:
commit 7ca8d2042d1cac990d77982a2bcf492ed0548a8b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jul 23 16:31:19 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 548bc6c..8227d25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ include:
   - project: 'freedesktop/ci-templates'
     ref: *template_sha
     file: '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
 
 # global variables to be used by most/all jobs.
 variables:
commit 644e96bf5ec409519a6f653c17409d2f03463a21
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Jul 23 16:30:31 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 bfee17e..548bc6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,20 @@
-# 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:
   # Arch container builder template
   - project: 'freedesktop/ci-templates'
-    ref: 6f86b8bcb0cd5168c32779c4fea9a893c4a0c046
+    ref: *template_sha
     file:
       - '/templates/arch.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
 
 # global variables to be used by most/all jobs.
 variables:
@@ -20,6 +29,46 @@ stages:
   - build
   - test
 
+
+#
+# Verify that commit messages are as expected
+#
+check-commits:
+  extends:
+    - .fdo.ci-fairy
+  stage: check
+  script:
+    - ci-fairy check-commits --junit-xml=results.xml
+  except:
+    - master at xorg/proto/xorgproto
+  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: check
+  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 at arch