[Xcb-commit] xcb/demo: 3 commits - .gitlab-ci.yml rendertest.c xcbrandr.c

[GitLab Mirror]

 .gitlab-ci.yml |   98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rendertest.c   |    4 +-
 xcbrandr.c     |    4 +-
 3 files changed, 102 insertions(+), 4 deletions(-)

New commits:
commit 89a49769c9eadb86bed80d169e611a389ba58f00
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jul 18 12:37:16 2022 -0700

    xcbrandr.c: convert from ISO-8859-1 to UTF-8
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/xcbrandr.c b/xcbrandr.c
index ed8eebf..2d445dd 100644
--- a/xcbrandr.c
+++ b/xcbrandr.c
@@ -1,8 +1,8 @@
 /*
  * $XFree86: xc/programs/xrandr/xrandr.c,v 1.11 2002/10/14 18:01:43 keithp Exp $
  *
- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
- * Copyright © 2002 Hewlett Pacard Company, Inc.
+ * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2002 Hewlett Pacard Company, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
commit 53fa425a90b058498e5c7240bc73c5de1f549f82
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jul 18 12:14:57 2022 -0700

    Fix spelling/wording issues
    
    Found by using:
        codespell --builtin clear,rare,usage,informal,code,names
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/rendertest.c b/rendertest.c
index 9758574..3a89898 100644
--- a/rendertest.c
+++ b/rendertest.c
@@ -256,7 +256,7 @@ int draw_window(xcb_connection_t *conn, xcb_render_query_pict_formats_reply_t *r
     alpha_color.blue = 0x0000;
     alpha_color.alpha = 0xffff;
 
-    /* Create the trapeziod dimensions */
+    /* Create the trapezoid dimensions */
     traps[0].top = make_fixed(300, 32000);
     traps[0].bottom = make_fixed(416, 0);
     traps[0].left.p1.y = make_fixed(250, 0);
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
     draw_window(c, formats_reply);
 #endif
     
-    /* It's very important to free the replys. We don't want memory leaks. */
+    /* It's very important to free the replies. We don't want memory leaks. */
     free(version_reply);
     free(formats_reply);
 
commit b78bb45103f03d1f0b3fb7716ef856ebf98b511d
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jul 18 12:13:33 2022 -0700

    gitlab CI: add a basic build test
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..1ce27be
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,98 @@
+# 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 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
+
+include:
+  # Arch container builder template
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/arch.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
+
+
+stages:
+  - prep             # prep work like rebuilding the container images if there is a change
+  - build            # for actually building and testing things in a container
+  - test
+  - deploy
+
+
+variables:
+  FDO_UPSTREAM_REPO: 'xorg/app/xcb-demo'
+  # The tag should be updated each time the list of packages is updated.
+  # Changing a tag forces the associated image to be rebuilt.
+  # Note: the tag has no meaning, we use a date format purely for readability
+  FDO_DISTRIBUTION_TAG:  '2022-07-18.1'
+  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake make libxcb xcb-util xcb-util-image xcb-util-wm xorgproto'
+
+
+#
+# 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 at xorg/app/xcb-demo
+  variables:
+    GIT_DEPTH: 100
+  artifacts:
+    reports:
+      junit: results.xml
+
+#
+# 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 at arch
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+
+
+#
+# The default build, runs on the image built above.
+#
+build:
+  stage: build
+  extends:
+    - .fdo.distribution-image at arch
+  script:
+    - autoreconf -ivf
+    - mkdir _builddir
+    - pushd _builddir > /dev/null
+    - ../configure --disable-silent-rules
+    - make
+    - make check
+    - make distcheck
+    - popd > /dev/null