The open source OpenXR runtime
ci: Be able to drop distro versions for Arch and Alpine, rebuild arch
authored by
Ryan Pavlik
and committed by
Simon Zeni
b0efc5e8
2b418abf
+48
-29
+14
-14
.gitlab-ci.yml
+14
-14
.gitlab-ci.yml
···
6
6
# see .gitlab-ci/ci.template, etc instead
7
7
###############################################
8
8
9
-
# Detached MR pipelines, needed due to https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
10
-
11
9
# workflow:
12
10
# rules:
13
11
# - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
···
24
22
- "/templates/ubuntu.yml"
25
23
- "/templates/arch.yml"
26
24
# - local: .gitlab-ci/containers/ci-container-prep.yml
25
+
26
+
# This include is for compatibility with the fdo CI restrictions/checks
27
+
# needed due to https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
27
28
- local: .gitlab-ci/ci-rules.yml
28
29
29
30
stages:
···
149
150
FDO_DISTRIBUTION_VERSION: "22.04"
150
151
FDO_DISTRIBUTION_TAG: "2022-09-20.0"
151
152
152
-
# Variables for build and usage of Arch rolling image
153
-
.monado.variables.arch:rolling:
153
+
# Variables for build and usage of Arch image
154
+
.monado.variables.arch:
154
155
variables:
155
-
FDO_DISTRIBUTION_VERSION: "rolling"
156
-
FDO_DISTRIBUTION_TAG: "2023-05-22.0"
156
+
FDO_DISTRIBUTION_TAG: "2023-11-14.0"
157
157
158
158
159
159
###
···
204
204
variables:
205
205
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libavcodec-dev libbluetooth-dev libbsd-dev libcjson-dev libdbus-1-dev libegl1-mesa-dev libeigen3-dev libgl1-mesa-dev libglvnd-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libhidapi-dev libopencv-dev libsdl2-dev libsystemd-dev libudev-dev libusb-1.0-0-dev libuvc-dev libv4l-dev libvulkan-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb-randr0-dev libxrandr-dev libxxf86vm-dev ninja-build pandoc patch pkg-config python3 reprepro unzip wget'
206
206
207
-
# Make Arch rolling image
208
-
arch:rolling:container_prep:
207
+
# Make Arch image
208
+
arch:container_prep:
209
209
stage: container_prep
210
210
extends:
211
211
- .container-rules
212
-
- .monado.variables.arch:rolling
212
+
- .monado.variables.arch
213
213
- .fdo.container-build@arch # from ci-templates
214
214
215
215
variables:
···
252
252
- .build-rules
253
253
254
254
255
-
# Base for using Arch rolling image
256
-
.monado.image.arch:rolling:
255
+
# Base for using Arch image
256
+
.monado.image.arch:
257
257
extends:
258
-
- .monado.variables.arch:rolling
258
+
- .monado.variables.arch
259
259
- .fdo.distribution-image@arch # from ci-templates
260
260
- .build-rules
261
261
···
499
499
arch:cmake:
500
500
stage: build
501
501
extends:
502
-
- .monado.image.arch:rolling
502
+
- .monado.image.arch
503
503
script:
504
504
505
505
- .gitlab-ci/prebuild.sh
···
509
509
arch:cmake:clang:
510
510
stage: build
511
511
extends:
512
-
- .monado.image.arch:rolling
512
+
- .monado.image.arch
513
513
script:
514
514
515
515
- .gitlab-ci/prebuild.sh
+6
-2
.gitlab-ci/ci-containers-variables.yml.jinja
+6
-2
.gitlab-ci/ci-containers-variables.yml.jinja
···
3
3
# SPDX-FileCopyrightText: 2018-2023 Collabora, Ltd. and the Monado contributors
4
4
#}
5
5
6
+
{% from 'functions.jinja' import image_name, image_name_for_comment with context %}
7
+
6
8
{% for distro in distributions -%} {%- for image in distro.images %}
7
9
8
-
# Variables for build and usage of {{ distro.name|capitalize }} {{image.codename}} image
9
-
.monado.variables.{{distro.name}}:{{image.codename}}:
10
+
# Variables for build and usage of {{ image_name_for_comment(distro, image) }} image
11
+
.monado.variables.{{ image_name(distro, image) }}:
10
12
variables:
13
+
{% if "codename" in image or "distro_version" in image %}
11
14
FDO_DISTRIBUTION_VERSION: "{{ image["distro_version"] | default(image.codename) }}"
15
+
{% endif %}
12
16
FDO_DISTRIBUTION_TAG: "{{image["tag"]}}"
13
17
{% if "repo_suffix" in image %}
14
18
FDO_REPO_SUFFIX: {{image["repo_suffix"]}}
+8
-6
.gitlab-ci/ci-containers.yml.jinja
+8
-6
.gitlab-ci/ci-containers.yml.jinja
···
3
3
# SPDX-FileCopyrightText: 2018-2023 Collabora, Ltd. and the Monado contributors
4
4
#}
5
5
6
+
{% from 'functions.jinja' import image_name, image_name_for_comment with context %}
7
+
6
8
###
7
9
# Container prep jobs
8
10
9
11
{%- for distro in distributions -%} {%- for image in distro.images %}
10
12
11
-
# Make {{ distro.name|capitalize }} {{image.codename}} image
12
-
{{distro.name}}:{{image.codename}}:container_prep:
13
+
# Make {{ image_name_for_comment(distro, image) }} image
14
+
{{ image_name(distro, image) }}:container_prep:
13
15
stage: container_prep
14
16
extends:
15
17
- .container-rules
16
-
- .monado.variables.{{distro.name}}:{{image.codename}}
18
+
- .monado.variables.{{ image_name(distro, image) }}
17
19
- .fdo.container-build@{{distro.name}} # from ci-templates
18
20
19
21
variables:
···
31
33
# Container usage base jobs
32
34
{% for distro in distributions -%} {%- for image in distro.images %}
33
35
34
-
# Base for using {{ distro.name|capitalize }} {{image.codename}} image
35
-
{{base_job_to_use_image(distro, image)}}:
36
+
# Base for using {{ image_name_for_comment(distro, image) }} image
37
+
{{ base_job_to_use_image(distro, image) }}:
36
38
extends:
37
-
- .monado.variables.{{distro.name}}:{{image.codename}}
39
+
- .monado.variables.{{ image_name(distro, image) }}
38
40
- .fdo.{{ "suffixed" if "repo_suffix" in image else "distribution" }}-image@{{distro.name}} # from ci-templates
39
41
- .build-rules
40
42
+5
-4
.gitlab-ci/ci.template
+5
-4
.gitlab-ci/ci.template
···
22
22
make -f .gitlab-ci/ci-scripts.mk
23
23
#}
24
24
25
-
# Detached MR pipelines, needed due to https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
26
-
27
25
# workflow:
28
26
# rules:
29
27
# - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
···
40
38
- "/templates/{{distro.name}}.yml"
41
39
{% endfor %}
42
40
# - local: .gitlab-ci/containers/ci-container-prep.yml
41
+
42
+
# This include is for compatibility with the fdo CI restrictions/checks
43
+
# needed due to https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
43
44
- local: .gitlab-ci/ci-rules.yml
44
45
45
46
stages:
···
65
66
{% include 'ci-containers-variables.yml.jinja' %}
66
67
{% include 'ci-containers.yml.jinja' %}
67
68
68
-
{% from 'functions.jinja' import base_job_to_use_image_containing, base_job_to_use_image with context %}
69
+
{% from 'functions.jinja' import image_name, base_job_to_use_image_containing, base_job_to_use_image with context %}
69
70
70
71
# Style check job
71
72
format-and-spellcheck:
···
176
177
- build/Testing/Temporary
177
178
178
179
{% macro packaging_job_name(distro, image) -%}
179
-
{{distro.name}}:{{image.codename}}:package
180
+
{{ image_name(distro, image) }}:package
180
181
{%- endmacro %}
181
182
182
183
{% for distro in distributions -%} {%- for image in distro.images if "deb_version_suffix" in image %}
+1
-2
.gitlab-ci/config.yml
+1
-2
.gitlab-ci/config.yml
···
195
195
196
196
- name: arch
197
197
images:
198
-
- codename: rolling
199
-
tag: "2023-05-22.0"
198
+
- tag: "2023-11-14.0"
200
199
script: install-arch-additional-deps.sh
201
200
# pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively
202
201
# python-setuptools glu: librealsense
+14
-1
.gitlab-ci/functions.jinja
+14
-1
.gitlab-ci/functions.jinja
···
10
10
{% endfor -%} {%- endfor %}
11
11
{% endmacro -%}
12
12
13
+
{# Macro to compute a part of a job name, etc. for a distro and image #}
14
+
{% macro image_name(distro, image) -%}
15
+
{{ distro.name }}
16
+
{%- if "codename" in image %}:{{ image.codename }}{%- endif -%}
17
+
{%- endmacro -%}
18
+
13
19
{# Macro to compute job name to extend to use image given distro and image objects#}
14
-
{% macro base_job_to_use_image(distro, image) %}.monado.image.{{distro.name}}:{{image.codename}}{% endmacro -%}
20
+
{% macro base_job_to_use_image(distro, image) %}.monado.image.{{ image_name(distro, image) }}{% endmacro -%}
21
+
22
+
23
+
{# Macro to compute a part of a comment describing a distro and image #}
24
+
{% macro image_name_for_comment(distro, image) %}
25
+
{{ distro.name | capitalize }}
26
+
{%- if "codename" in image %} {{ image.codename }}{%- endif -%}
27
+
{%- endmacro -%}