Gracefully handle errors during early request binding.
Signed-off-by: zhang-liang-pengkun <zhangliangpengkun@xfusion.com>
This commit is contained in:
zhang-liang-pengkun
parent
e2af006b35
commit
6ec01d29f3
118
0003-gitlab-CI-add-a-basic-build-test.patch
Normal file
118
0003-gitlab-CI-add-a-basic-build-test.patch
Normal file
@ -0,0 +1,118 @@
|
||||
From c6ff062ef9e4535527727678bd23b41412131638 Mon Sep 17 00:00:00 2001
|
||||
From: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Wed, 20 Jul 2022 15:26:21 -0700
|
||||
Subject: [PATCH] gitlab CI: add a basic build test
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
---
|
||||
.gitlab-ci.yml | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 98 insertions(+)
|
||||
create mode 100644 .gitlab-ci.yml
|
||||
|
||||
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
||||
new file mode 100644
|
||||
index 0000000..37a8907
|
||||
--- /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-render-util'
|
||||
+ # 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 doxygen graphviz xorgproto libxcb'
|
||||
+ 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@xorg/lib/libxcb-render-util
|
||||
+ 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@arch
|
||||
+ stage: prep
|
||||
+ variables:
|
||||
+ GIT_STRATEGY: none
|
||||
+
|
||||
+
|
||||
+#
|
||||
+# The default build, runs on the image built above.
|
||||
+#
|
||||
+build:
|
||||
+ stage: build
|
||||
+ extends:
|
||||
+ - .fdo.distribution-image@arch
|
||||
+ script:
|
||||
+ - autoreconf -ivf
|
||||
+ - mkdir _builddir
|
||||
+ - pushd _builddir > /dev/null
|
||||
+ - ../configure --disable-silent-rules
|
||||
+ - make
|
||||
+ - make check
|
||||
+ - make distcheck
|
||||
+ - popd > /dev/null
|
||||
--
|
||||
2.39.0.windows.2
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: xcb-util-renderutil
|
||||
Version: 0.3.9
|
||||
Release: 16
|
||||
Release: 17
|
||||
Summary: Render extension convenience functions
|
||||
License: MIT
|
||||
URL: https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util
|
||||
@ -9,6 +9,7 @@ BuildRequires: gcc pkgconfig(xcb-util) >= 0.3.8 m4
|
||||
|
||||
Patch0001: backport-0001-Update-configure.ac-bug-URL-for-gitlab-migration.patch
|
||||
Patch0002: 0002-Build-xz-tarballs-instead-of-bzip2.patch
|
||||
Patch0003: 0003-gitlab-CI-add-a-basic-build-test.patch
|
||||
|
||||
%description
|
||||
Utility libraries for XC Binding - Convenience functions for the Render extension.
|
||||
@ -51,6 +52,9 @@ make check
|
||||
%{_includedir}/xcb/*.h
|
||||
|
||||
%changelog
|
||||
* Mon Jan 29 2024 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 0.3.9-17
|
||||
- gitlab CI: add a basic build test
|
||||
|
||||
* Thu Jan 18 2024 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 0.3.9-16
|
||||
- Build xz tarballs instead of bzip2
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user