+11 -8

.gitlab-ci.yml

··· 6 6 # see .gitlab-ci/ci.template instead # 7 7 ###################################### 8 8 9 9 + # Detached MR pipelines, needed due to https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438 10 10 + 11 11 + workflow: 12 12 + rules: 13 13 + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' 14 14 + - if: $CI_PIPELINE_SOURCE == 'push' 15 15 + 9 16 variables: 10 17 FDO_UPSTREAM_REPO: monado/monado 11 18 12 12 - .templates_sha: &templates_sha d5aa3941aa03c2f716595116354fb81eb8012acb 19 19 + .templates_sha: &templates_sha 9f0eb526291fe74651fe1430cbd2397f4c0a819b 13 20 14 21 include: 15 22 # Debian ··· 127 134 changes: 128 135 - .gitlab-ci/**/* 129 136 variables: 130 130 - # pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively 131 131 - # python-setuptools glu: librealsense 132 132 - # glew boost gtest fmt bc: basalt-monado-git 133 133 - # python-attrs: xr-hardware-git 134 134 - FDO_DISTRIBUTION_PACKAGES: 'base-devel pipewire-jack wireplumber bluez-libs check clang cmake diffutils doxygen eigen ffmpeg gcc git glfw-x11 glslang graphviz gtk3 hidapi libusb libxrandr mesa ninja opencv patch pkgconfig python3 qt5-base v4l-utils vulkan-headers vulkan-icd-loader wget meson python-setuptools glu glew boost gtest fmt bc wayland libbsd python-attrs' 135 135 - FDO_DISTRIBUTION_EXEC: bash .gitlab-ci/install-arch-additional-deps.sh 137 137 + FDO_DISTRIBUTION_PACKAGES: 'base-devel bc bluez-libs boost check clang cmake diffutils doxygen eigen ffmpeg fmt gcc git glew glfw-x11 glslang glu graphviz gtest gtk3 hidapi libbsd libusb libxrandr mesa meson ninja opencv patch pipewire-jack pkgconfig python-attrs python-setuptools python3 qt5-base v4l-utils vulkan-headers vulkan-icd-loader wayland wget wireplumber' 138 138 + FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/install-arch-additional-deps.sh' 136 139 137 140 ### 138 141 # Container usage base jobs ··· 626 629 - mv repo public/apt 627 630 artifacts: 628 631 paths: 629 629 - - public 632 632 + - public

+2 -2

.gitlab-ci/README.md

··· 1 1 # CI and Generated Stuff Readme 2 2 3 3 <!-- 4 4 - # Copyright 2018-2022 Collabora, Ltd. and the Monado contributors 4 4 + # Copyright 2018-2023 Collabora, Ltd. and the Monado contributors 5 5 # 6 6 # SPDX-License-Identifier: CC0-1.0 7 7 --> ··· 16 16 17 17 <!-- do not break the following line, it is used in CI setup too, to make sure it works --> 18 18 ```sh 19 19 - python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@d5aa3941aa03c2f716595116354fb81eb8012acb 19 19 + python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@9f0eb526291fe74651fe1430cbd2397f4c0a819b 20 20 ``` 21 21 22 22 On Windows you will also need to have GNU make and busybox installed, such as with:

+7

.gitlab-ci/ci.template

··· 21 21 make -f .gitlab-ci/ci-scripts.mk 22 22 #} 23 23 24 24 + # Detached MR pipelines, needed due to https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438 25 25 + 26 26 + workflow: 27 27 + rules: 28 28 + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' 29 29 + - if: $CI_PIPELINE_SOURCE == 'push' 30 30 + 24 31 variables: 25 32 FDO_UPSTREAM_REPO: monado/monado 26 33

+40 -20

.gitlab-ci/config.yml

··· 1 1 # SPDX-License-Identifier: CC0-1.0 2 2 - # SPDX-FileCopyrightText: 2018-2022 Collabora, Ltd. and the Monado contributors 2 2 + # SPDX-FileCopyrightText: 2018-2023 Collabora, Ltd. and the Monado contributors 3 3 4 4 # Please run the following from the repo root after modifying this file: 5 5 # make -f .gitlab-ci/ci-scripts.mk 6 6 7 7 - fdo_ci_templates_sha: d5aa3941aa03c2f716595116354fb81eb8012acb 7 7 + fdo_ci_templates_sha: 9f0eb526291fe74651fe1430cbd2397f4c0a819b 8 8 9 9 # These are a mapping, instead of a list/array, so we can merge. 10 10 .default_debian_packages: ··· 195 195 - name: arch 196 196 images: 197 197 - codename: rolling 198 198 - tag: "2022-09-20.0" 198 198 + tag: "2023-03-13.2" 199 199 + script: install-arch-additional-deps.sh 200 200 + # pipewire-jack wireplumber: Explicitly choose dependencies to avoid pacman asking interactively 201 201 + # python-setuptools glu: librealsense 202 202 + # glew boost gtest fmt bc: basalt-monado-git 203 203 + # python-attrs: xr-hardware-git 199 204 packages: 200 200 - git: 201 201 - gcc: 205 205 + base-devel: 206 206 + pipewire-jack: 207 207 + wireplumber: 208 208 + bluez-libs: 209 209 + check: 202 210 clang: 203 211 cmake: 204 204 - ninja: 205 205 - pkgconfig: 206 206 - python3: 207 212 diffutils: 208 208 - patch: 209 213 doxygen: 210 210 - graphviz: 211 214 eigen: 215 215 + ffmpeg: 216 216 + gcc: 217 217 + git: 218 218 + glfw-x11: 219 219 + glslang: 220 220 + graphviz: 221 221 + gtk3: 212 222 hidapi: 223 223 + libusb: 213 224 libxrandr: 214 225 mesa: 215 215 - glslang: 216 216 - vulkan-headers: 217 217 - vulkan-icd-loader: 218 218 - check: 219 219 - glfw-x11: 220 220 - libusb: 226 226 + ninja: 221 227 opencv: 222 222 - gtk3: 223 223 - ffmpeg: 228 228 + patch: 229 229 + pkgconfig: 230 230 + python3: 231 231 + qt5-base: 224 232 v4l-utils: 225 225 - qt5-base: 226 226 - bluez-libs: 233 233 + vulkan-headers: 234 234 + vulkan-icd-loader: 235 235 + wget: 236 236 + meson: 237 237 + python-setuptools: 238 238 + glu: 239 239 + glew: 240 240 + boost: 241 241 + gtest: 242 242 + fmt: 243 243 + bc: 244 244 + wayland: 245 245 + libbsd: 246 246 + python-attrs: 227 247 build_jobs: 228 248 - name: "arch:cmake" 229 249

.gitlab-ci/install-arch-additional-deps.sh