blob: f4819a71b4b92e247bbae36c2745a025eed41123 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
# 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/libXcursor'
# 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: '2025-02-15.0'
# minimal set of packages required to build and install either way
BASE_PACKAGES: 'git gcc clang pkgconf libxrender libxfixes libx11 xorgproto'
# packages needed to build and install with each set of tools
AUTOTOOLS_PACKAGES: 'autoconf automake libtool make xorg-util-macros'
MESON_PACKAGES: 'meson ninja'
# extra packages we need for comparing autotools & meson builds
EXTRA_PACKAGES: 'diffoscope diffutils findutils jq'
FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $AUTOTOOLS_PACKAGES $MESON_PACKAGES $EXTRA_PACKAGES
#
# 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/libXcursor
variables:
GIT_DEPTH: 10
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 autotools build, runs on the image built above.
#
autotools:
stage: build
extends:
- .fdo.distribution-image@arch
script:
- autoreconf -ivf
- mkdir _builddir
- pushd _builddir > /dev/null
- ../configure --disable-silent-rules --enable-unit-tests
- make
- make check
- make distcheck
- mv libXcursor*.tar.gz ..
- popd > /dev/null
artifacts:
paths:
- libXcursor*.tar.gz
#
# The meson build, runs on the image built above.
#
.meson_build:
stage: build
extends:
- .fdo.distribution-image@arch
script:
- CC="${CC}" meson setup _builddir --prefix="$PWD/_install"
- meson compile -C _builddir
- meson test -C _builddir
- meson install -C _builddir
# Run meson build with different compilers
meson:
extends:
- .meson_build
parallel:
matrix:
- CC: ["gcc", "clang"]
meson from tarball:
extends:
- .fdo.distribution-image@arch
stage: test
script:
- mkdir -p _tarball_build
- tar xf libXcursor-*.tar.gz -C _tarball_build
- cd _tarball_build/libXcursor-*
- meson setup _builddir
- meson compile -C _builddir
- meson test -C _builddir
needs:
- autotools
compare meson and autotools:
extends:
- .fdo.distribution-image@arch
stage: test
script:
- mkdir -p $PWD/_meson_inst $PWD/_autotools_inst
- CFLAGS="-O2"
meson setup builddir --prefix=/usr --buildtype=plain
-Ddefault_library=shared
- meson compile -C builddir -v
- DESTDIR=$PWD/_meson_inst meson install -C builddir
- ./autogen.sh --prefix=/usr --enable-shared --disable-static
CFLAGS="-O2 -D_FILE_OFFSET_BITS=64" XCURSOR_LIBS="-lXrender -lX11 -lXfixes"
- make V=1 && make install DESTDIR=$PWD/_autotools_inst
# get rid of expected differences between the two
- rm -f $PWD/_autotools_inst/usr/lib/lib*.la
- rm -f $PWD/_autotools_inst/usr/lib/libXcursor.so
- ln -s libXcursor.so.1 $PWD/_autotools_inst/usr/lib/libXcursor.so
- sed -i -e '/Generated from Xcursor.h.in by configure/d'
_autotools_inst/usr/include/X11/Xcursor/Xcursor.h
- sed -i -e 's/{exec_prefix}/{prefix}/' -e '/exec_prefix/d'
_autotools_inst/usr/lib/pkgconfig/xcursor.pc
- find $PWD/_meson_inst $PWD/_autotools_inst
-exec touch -h -r $PWD/_meson_inst/ {} \+
- diffoscope --text-color=always _autotools_inst _meson_inst
check versions are in sync:
extends:
- .fdo.distribution-image@arch
stage: test
script:
- autoreconf -ivf
- ./configure --version | head -n 1 | sed -e 's/libXcursor configure //' > autotools.version
- meson introspect meson.build --projectinfo | jq -r '.version' > meson.version
- diff -u autotools.version meson.version ||
(echo "ERROR - autotools and meson versions not in sync" && false)
|
