[Xcb-commit] util-image: 3 commits - configure.ac .gitlab-ci.yml m4

[GitLab Mirror]

 .gitlab-ci.yml |   98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac   |    2 -
 m4             |    2 -
 3 files changed, 100 insertions(+), 2 deletions(-)

New commits:
commit f568785753b4c380b40b8781c8aefd2fa5ae3cb5
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Jul 20 15:05:26 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..4a71c48
--- /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/lib/libxcb-image'
+  # 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-20.0'
+  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto libxcb xcb-util'
+  GIT_SUBMODULE_STRATEGY: normal
+
+#
+# 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/lib/libxcb-image
+  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
commit e552a1feb89854eedc3dfbfeb112bb7d982a24b2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Jul 20 15:05:11 2022 -0700

    Build xz tarballs instead of bzip2
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/configure.ac b/configure.ac
index 2554930..ab62830 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_INIT([xcb-util-image],[0.4.0],
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 AM_MAINTAINER_MODE
 
 XCB_UTIL_COMMON([1.4], [1.6])
commit 60697af2831a3cb7d59f54569e868f3cc6e71a92
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Jul 20 15:03:45 2022 -0700

    Update m4 to xorg/util/xcb-util-m4 at c617eee22ae5c285e79e81
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/m4 b/m4
index f662e3a..c617eee 160000
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit f662e3a93ebdec3d1c9374382dcc070093a42fed
+Subproject commit c617eee22ae5c285e79e81ec39ce96862fd3262f