From f635ac290b1dbf9b33ba003ca22b51548ecd6659 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Thu, 18 Jul 2024 14:38:24 -0400 Subject: [PATCH] ci: fix packaging Part-of: --- .gitlab-ci.yml | 18 +++++++++--------- .gitlab-ci/config.yml | 11 ++++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d851d65c..68fc0b832 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,32 +126,32 @@ win:container_prep: .monado.variables.debian:bookworm: variables: FDO_DISTRIBUTION_VERSION: "bookworm" - FDO_DISTRIBUTION_TAG: "2024-04-16" + FDO_DISTRIBUTION_TAG: "2024-07-18" # Variables for build and usage of Debian bullseye image .monado.variables.debian:bullseye: variables: FDO_DISTRIBUTION_VERSION: "bullseye" - FDO_DISTRIBUTION_TAG: "2024-06-26" + FDO_DISTRIBUTION_TAG: "2024-07-18" # Variables for build and usage of Debian bookworm-ndk image .monado.variables.debian:bookworm-ndk: variables: FDO_DISTRIBUTION_VERSION: "bookworm" - FDO_DISTRIBUTION_TAG: "2024-07-02" + FDO_DISTRIBUTION_TAG: "2024-07-18" FDO_REPO_SUFFIX: ndk # Variables for build and usage of Ubuntu jammy image .monado.variables.ubuntu:jammy: variables: FDO_DISTRIBUTION_VERSION: "22.04" - FDO_DISTRIBUTION_TAG: "2024-04-16" + FDO_DISTRIBUTION_TAG: "2024-07-18" # Variables for build and usage of Ubuntu noble image .monado.variables.ubuntu:noble: variables: FDO_DISTRIBUTION_VERSION: "24.04" - FDO_DISTRIBUTION_TAG: "2024-05-11" + FDO_DISTRIBUTION_TAG: "2024-07-18" # Variables for build and usage of Arch image .monado.variables.arch: @@ -175,7 +175,7 @@ debian:bookworm:container_prep: - .fdo.container-build@debian # from ci-templates 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 reprepro 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 libdistro-info-perl 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' # Make Debian bullseye image @@ -187,7 +187,7 @@ debian:bullseye:container_prep: - .fdo.container-build@debian # from ci-templates 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 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 libdistro-info-perl 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' FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/bullseye_backports.sh' # Make Debian bookworm-ndk image @@ -211,7 +211,7 @@ ubuntu:jammy:container_prep: - .fdo.container-build@ubuntu # from ci-templates 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 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 libdistro-info-perl 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 Ubuntu noble image ubuntu:noble:container_prep: @@ -222,7 +222,7 @@ ubuntu:noble:container_prep: - .fdo.container-build@ubuntu # from ci-templates 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 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 libdistro-info-perl 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 arch:container_prep: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 579089649..17f889f3d 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -53,6 +53,7 @@ fdo_ci_templates_sha: 185ede0e9b9b1924b92306ab8b882a6294e92613 devscripts: dput-ng: gettext-base: + libdistro-info-perl: pandoc: # These config defines are used for all NDK builds @@ -72,7 +73,7 @@ distributions: # This image does some extra work. - codename: bookworm script: i386_and_proclamation_container_prep.sh - tag: "2024-04-16" + tag: "2024-07-18" deb_version_suffix: bpo12 packages: <<: *default_debian_packages @@ -117,7 +118,7 @@ distributions: XRT_HAVE_OPENCV: "OFF" - codename: bullseye - tag: "2024-06-26" + tag: "2024-07-18" script: bullseye_backports.sh deb_version_suffix: bpo11 packages: @@ -132,7 +133,7 @@ distributions: distro_version: bookworm repo_suffix: ndk script: android_container_prep.sh - tag: "2024-07-02" + tag: "2024-07-18" # This must match ext.sharedCompileSdk in build.gradle android_compile_sdk: 34 # This must match buildscript.ext.buildToolsVersion in build.gradle @@ -192,7 +193,7 @@ distributions: # LTS - codename: jammy distro_version: "22.04" - tag: "2024-04-16" + tag: "2024-07-18" deb_version_suffix: ubuntu2204 packages: <<: *default_debian_packages @@ -202,7 +203,7 @@ distributions: - codename: noble distro_version: "24.04" - tag: "2024-05-11" + tag: "2024-07-18" deb_version_suffix: ubuntu2404 packages: <<: *default_debian_packages