mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 10:36:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Fix reprepro.

Browse source 
It has to run on the latest Debian-like distro.
This commit is contained in:
Rylie Pavlik 2024-04-15 16:47:26 -05:00
parent a187a57f92
commit 9c0bc0873e
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -179,7 +179,7 @@ debian:bookworm:container_prep:
- .fdo.container-build@debian # from ci-templates - .fdo.container-build@debian # from ci-templates
variables: variables:
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' 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'
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/i386_and_proclamation_container_prep.sh' FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/i386_and_proclamation_container_prep.sh'
# Make Debian bullseye image # Make Debian bullseye image
@ -225,7 +225,7 @@ ubuntu:jammy:container_prep:
- .fdo.container-build@ubuntu # from ci-templates - .fdo.container-build@ubuntu # from ci-templates
variables: variables:
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' 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'
# Make Arch image # Make Arch image
arch:container_prep: arch:container_prep:
@ -712,7 +712,7 @@ ubuntu:jammy:package:
reprepro:package: reprepro:package:
stage: reprepro stage: reprepro
extends: extends:
- .monado.image.ubuntu:jammy - .monado.image.debian:bookworm
- .monado.packaging.conditions - .monado.packaging.conditions
needs: needs:

8
.gitlab-ci/config.yml
View file

@ -76,13 +76,16 @@ distributions:
deb_version_suffix: bpo12 deb_version_suffix: bpo12
packages: packages:
<<: *default_debian_packages <<: *default_debian_packages
clang-format:
codespell: codespell:
doxygen: doxygen:
graphviz: graphviz:
pipx: pipx:
python3-pip:
python3-click: python3-click:
clang-format: python3-pip:
# reprepro must always run on the most recent debian-derived distribution so it is aware of all distros we package for.
# Right now that is bookworm but it will be a new Ubuntu soon.
reprepro:
build_jobs: build_jobs:
- name: "debian:cmake" - name: "debian:cmake"
# Generate "changes since last release" and add to changelog, # Generate "changes since last release" and add to changelog,
@ -198,7 +201,6 @@ distributions:
deb_version_suffix: ubuntu2204 deb_version_suffix: ubuntu2204
packages: packages:
<<: *default_debian_packages <<: *default_debian_packages
reprepro:
build_jobs: build_jobs:
- name: "ubuntu:jammy:cmake" - name: "ubuntu:jammy:cmake"
cmake_defines: cmake_defines: