The open source OpenXR runtime
ci: Re-organize and port to the new fdo templates.
authored by
Ryan Pavlik
and committed by
Jakob Bornecrantz
cc8dbb4f
cb309612
+94
-40
+82
-40
.gitlab-ci.yml
+82
-40
.gitlab-ci.yml
···
2
2
# SPDX-FileCopyrightText: 2018-2020 Collabora, Ltd. and the Monado contributors
3
3
4
4
variables:
5
-
UPSTREAM_REPO: monado/monado
5
+
FDO_UPSTREAM_REPO: monado/monado
6
6
7
-
DEBIAN_TAG: 2019-03-23.0
7
+
DEBIAN_TAG: 2019-04-27.0
8
8
DEBIAN_VERSION: buster
9
9
DEBIAN_CONTAINER_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
10
+
NDK_TAG: 2020-04-27.0
11
+
NDK_CONTAINER_IMAGE: "$CI_REGISTRY_IMAGE/debian/ndk:$NDK_TAG"
10
12
11
13
ARCH_TAG: 2019-12-03.0
12
14
ARCH_CONTAINER_IMAGE: "$CI_REGISTRY_IMAGE/archlinux/rolling:$ARCH_TAG"
13
15
16
+
.templates_sha: &templates_sha 322bf2b8f29b6491caeb13861201e96969ddc169
17
+
18
+
# Variables for build and usage of Debian 10 (Buster) image
19
+
.monado.debian:buster:
20
+
variables:
21
+
FDO_DISTRIBUTION_VERSION: buster
22
+
FDO_DISTRIBUTION_TAG: "2019-04-28.0"
23
+
24
+
# Variables for build and usage of Arch Linux image
25
+
.monado.arch:rolling:
26
+
variables:
27
+
FDO_DISTRIBUTION_TAG: "2019-04-28.0"
28
+
14
29
include:
15
-
- project: "wayland/ci-templates"
16
-
ref: 0a9bdd33a98f05af6761ab118b5074952242aab0
30
+
- project: "freedesktop/ci-templates"
31
+
ref: *templates_sha
17
32
file: "/templates/debian.yml"
18
-
- project: "wayland/ci-templates"
19
-
ref: 0a9bdd33a98f05af6761ab118b5074952242aab0
33
+
- project: "freedesktop/ci-templates"
34
+
ref: *templates_sha
20
35
file: "/templates/arch.yml"
21
36
22
37
stages:
···
25
40
- pages
26
41
- deploy
27
42
43
+
###
44
+
# Container prep jobs
45
+
46
+
# Base for all container prep
47
+
.monado.container_base:
48
+
# "stage" set here doesn't work, for some reason
49
+
variables:
50
+
# no need to pull the whole tree for rebuilding the image - is this still needed?
51
+
GIT_STRATEGY: none
52
+
# Each most-derived job has a script to set up stuff for it.
53
+
FDO_DISTRIBUTION_EXEC: "bash .gitlab-ci/${CI_JOB_NAME}.sh"
54
+
55
+
# Debian Buster (x64)
28
56
debian:container_prep:
29
-
extends: .debian@container-ifnot-exists
30
57
stage: container_prep
58
+
extends:
59
+
- .monado.debian:buster # local
60
+
- .monado.container_base # local
61
+
- .fdo.container-build@debian # from ci-templates
31
62
variables:
32
-
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
33
63
# a list of packages to install
34
-
DEBIAN_DEBS: "build-essential git cmake meson ninja-build doxygen graphviz libeigen3-dev curl patch python3 pkg-config libx11-dev libxxf86vm-dev libxrandr-dev libxcb-randr0-dev libhidapi-dev libwayland-dev libvulkan-dev glslang-dev glslang-tools libglvnd-dev libgl1-mesa-dev ca-certificates libusb-1.0-0-dev libuvc-dev libavcodec-dev libopencv-dev libudev-dev clang-format-7 codespell libv4l-dev libegl1-mesa-dev python3-click python3-pip"
35
-
DEBIAN_EXEC: "bash .gitlab-ci/build-openxr-openhmd.sh"
64
+
FDO_DISTRIBUTION_PACKAGES: "build-essential git wget unzip cmake meson ninja-build doxygen graphviz libeigen3-dev curl patch python3 pkg-config libx11-dev libxxf86vm-dev libxrandr-dev libxcb-randr0-dev libhidapi-dev libwayland-dev libvulkan-dev glslang-dev glslang-tools libglvnd-dev libgl1-mesa-dev ca-certificates libusb-1.0-0-dev libuvc-dev libavcodec-dev libopencv-dev libudev-dev clang-format-7 codespell libv4l-dev libegl1-mesa-dev python3-pip python3-click"
36
65
66
+
# Arch Linux (x64)
37
67
arch:container_prep:
38
-
extends: .arch@container-ifnot-exists
39
68
stage: container_prep
69
+
extends:
70
+
- .monado.arch:rolling # local
71
+
- .monado.container_base # local
72
+
- .fdo.container-build@arch # from ci-templates
40
73
variables:
41
-
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
42
74
# a list of packages to install
43
-
ARCH_PKGS: "git gcc cmake meson ninja pkgconfig python3 diffutils patch doxygen graphviz eigen hidapi libxrandr mesa glslang vulkan-headers vulkan-icd-loader check glfw-x11 libusb opencv gtk3 ffmpeg v4l-utils qt5-base"
44
-
ARCH_EXEC: "bash .gitlab-ci/build-openxr-openhmd.sh"
75
+
FDO_DISTRIBUTION_PACKAGES: "git gcc cmake meson ninja pkgconfig python3 diffutils patch doxygen graphviz eigen hidapi libxrandr mesa glslang vulkan-headers vulkan-icd-loader check glfw-x11 libusb opencv gtk3 ffmpeg v4l-utils qt5-base"
45
76
46
77
format-and-spellcheck:
78
+
extends:
79
+
- .monado.debian:buster # local
80
+
- .fdo.distribution-image@debian # from ci-templates
47
81
stage: build
48
-
image: $DEBIAN_CONTAINER_IMAGE
49
82
script:
50
83
- scripts/format-and-spellcheck.sh
51
84
artifacts:
···
54
87
expire_in: 1 week
55
88
when: on_failure
56
89
57
-
debian:build-cmake:
90
+
# "Base" job for a CMake build
91
+
.monado.build-cmake:
58
92
stage: build
59
-
image: $DEBIAN_CONTAINER_IMAGE
60
93
script:
61
94
- mkdir build
62
95
- pushd build
63
-
- cmake -GNinja ..
96
+
- cmake -GNinja .. $CMAKE_ARGS
64
97
- ninja
65
98
66
-
arch:build-cmake:
99
+
# "Base" job for a Meson build
100
+
.monado.build-meson:
67
101
stage: build
68
-
image: $ARCH_CONTAINER_IMAGE
69
102
script:
70
103
- mkdir build
71
104
- pushd build
72
-
- cmake -GNinja ..
105
+
- meson .. $MESON_ARGS
73
106
- ninja
74
107
75
-
debian:build-meson:
76
-
stage: build
77
-
image: $DEBIAN_CONTAINER_IMAGE
78
-
script:
79
-
# Generate "changes since last release"
108
+
debian:cmake:
109
+
extends:
110
+
- .monado.debian:buster # local
111
+
- .fdo.distribution-image@debian # from ci-templates
112
+
- .monado.build-cmake # local
113
+
before_script:
114
+
# Generate "changes since last release" and add to changelog,
115
+
# since this is the build that makes our docs.
80
116
- pip3 install proclamation
81
117
- pushd doc/changes
82
118
- proclamation build --overwrite vNEXT
83
119
- popd
84
-
# Now proceed with build.
85
-
- mkdir build
86
-
- pushd build
87
-
- meson ..
88
-
- ninja
89
120
artifacts:
90
121
paths:
91
122
- build/doc/html/
92
123
93
-
arch:build-meson:
94
-
stage: build
95
-
image: $ARCH_CONTAINER_IMAGE
96
-
script:
97
-
- mkdir build
98
-
- pushd build
99
-
- meson -Ddocs=disabled ..
100
-
- ninja
124
+
arch:cmake:
125
+
extends:
126
+
- .monado.arch:rolling # local
127
+
- .fdo.distribution-image@arch # from ci-templates
128
+
- .monado.build-cmake # local
129
+
130
+
debian:meson:
131
+
extends:
132
+
- .monado.debian:buster # local
133
+
- .fdo.distribution-image@debian # from ci-templates
134
+
- .monado.build-meson # local
135
+
136
+
arch:meson:
137
+
extends:
138
+
- .monado.arch:rolling # local
139
+
- .fdo.distribution-image@arch # from ci-templates
140
+
- .monado.build-meson # local
141
+
variables:
142
+
MESON_ARGS: -Ddocs=disabled
101
143
102
144
###
103
145
# Pages
···
107
149
only:
108
150
- master
109
151
dependencies:
110
-
- debian:build-meson
152
+
- debian:cmake
111
153
script:
112
154
- mkdir -p public
113
155
- mv build/doc/html/* public/
+6
.gitlab-ci/arch:container_prep.sh
+6
.gitlab-ci/arch:container_prep.sh