The open source OpenXR runtime
ci: Fix reprepro.
It has to run on the latest Debian-like distro.
+8
-6
+3
-3
.gitlab-ci.yml
+3
-3
.gitlab-ci.yml
···
179
179
- .fdo.container-build@debian # from ci-templates
180
180
181
181
variables:
182
-
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates clang-format cmake codespell curl debhelper devscripts doxygen dput-ng gettext-base git glslang-tools graphviz 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 pipx pkg-config python3 python3-click python3-pip unzip wayland-protocols wget'
182
+
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates clang-format cmake codespell curl debhelper devscripts doxygen dput-ng gettext-base git glslang-tools graphviz 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 pipx pkg-config python3 python3-click python3-pip reprepro unzip wayland-protocols wget'
183
183
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/i386_and_proclamation_container_prep.sh'
184
184
185
185
# Make Debian bullseye image
···
225
225
- .fdo.container-build@ubuntu # from ci-templates
226
226
227
227
variables:
228
-
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools 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 wayland-protocols wget'
228
+
FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools 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 unzip wayland-protocols wget'
229
229
230
230
# Make Arch image
231
231
arch:container_prep:
···
712
712
reprepro:package:
713
713
stage: reprepro
714
714
extends:
715
-
- .monado.image.ubuntu:jammy
715
+
- .monado.image.debian:bookworm
716
716
717
717
- .monado.packaging.conditions
718
718
needs:
+5
-3
.gitlab-ci/config.yml
+5
-3
.gitlab-ci/config.yml
···
76
76
deb_version_suffix: bpo12
77
77
packages:
78
78
<<: *default_debian_packages
79
+
clang-format:
79
80
codespell:
80
81
doxygen:
81
82
graphviz:
82
83
pipx:
84
+
python3-click:
83
85
python3-pip:
84
-
python3-click:
85
-
clang-format:
86
+
# reprepro must always run on the most recent debian-derived distribution so it is aware of all distros we package for.
87
+
# Right now that is bookworm but it will be a new Ubuntu soon.
88
+
reprepro:
86
89
build_jobs:
87
90
- name: "debian:cmake"
88
91
# Generate "changes since last release" and add to changelog,
···
198
201
deb_version_suffix: ubuntu2204
199
202
packages:
200
203
<<: *default_debian_packages
201
-
reprepro:
202
204
build_jobs:
203
205
- name: "ubuntu:jammy:cmake"
204
206
cmake_defines: