+65 -2

.gitlab-ci.yml

··· 43 43 .monado.variables.ubuntu:focal: 44 44 variables: 45 45 FDO_DISTRIBUTION_VERSION: "20.04" 46 46 + FDO_DISTRIBUTION_TAG: "2022-07-25.1" 47 47 + 48 48 + # Variables for build and usage of Ubuntu jammy image 49 49 + .monado.variables.ubuntu:jammy: 50 50 + variables: 51 51 + FDO_DISTRIBUTION_VERSION: "22.04" 46 52 FDO_DISTRIBUTION_TAG: "2022-07-25.0" 47 53 48 54 # Variables for build and usage of Arch rolling image ··· 97 103 changes: 98 104 - .gitlab-ci/**/* 99 105 variables: 106 106 + FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libavcodec-dev 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 wget' 107 107 + 108 108 + # Make Ubuntu jammy image 109 109 + ubuntu:jammy:container_prep: 110 110 + stage: container_prep 111 111 + extends: 112 112 + - .monado.variables.ubuntu:jammy 113 113 + - .fdo.container-build@ubuntu # from ci-templates 114 114 + only: 115 115 + changes: 116 116 + - .gitlab-ci/**/* 117 117 + variables: 100 118 FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libavcodec-dev 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 wget' 101 119 102 120 # Make Arch rolling image ··· 132 150 .monado.image.ubuntu:focal: 133 151 extends: 134 152 - .monado.variables.ubuntu:focal 153 153 + - .fdo.distribution-image@ubuntu # from ci-templates 154 154 + 155 155 + 156 156 + # Base for using Ubuntu jammy image 157 157 + .monado.image.ubuntu:jammy: 158 158 + extends: 159 159 + - .monado.variables.ubuntu:jammy 135 160 - .fdo.distribution-image@ubuntu # from ci-templates 136 161 137 162 ··· 417 442 paths: 418 443 - src/xrt/targets/openxr_android/build/outputs/apk/inProcess 419 444 420 420 - ubuntu:cmake: 445 445 + ubuntu:focal:cmake: 421 446 stage: build 422 447 extends: 423 448 - .monado.image.ubuntu:focal 449 449 + script: 450 450 + - rm -rf build 451 451 + - cmake -GNinja -B build -S . -DBUILD_DOC=OFF 452 452 + - echo "Build Options:"; grep "^XRT_" build/CMakeCache.txt 453 453 + - ninja -C build 454 454 + - cd build && ctest --output-on-failure 455 455 + 456 456 + ubuntu:jammy:cmake: 457 457 + stage: build 458 458 + extends: 459 459 + - .monado.image.ubuntu:jammy 424 460 script: 425 461 - rm -rf build 426 462 - cmake -GNinja -B build -S . -DBUILD_DOC=OFF ··· 526 562 - "incoming/" 527 563 expire_in: 2 days 528 564 565 565 + ubuntu:jammy:package: 566 566 + extends: 567 567 + - .monado.image.ubuntu:jammy 568 568 + - .monado.packaging.conditions 569 569 + variables: 570 570 + GIT_STRATEGY: clone 571 571 + DEBFULLNAME: "Monado CI" 572 572 + DEBEMAIL: "ryan.pavlik@collabora.com" 573 573 + DISTRO: ubuntu 574 574 + CODENAME: jammy 575 575 + DEB_VERSION_SUFFIX: ubuntu2204 576 576 + stage: package 577 577 + before_script: 578 578 + - git config --global user.name Monado CI 579 579 + - git config --global user.email ryan.pavlik@collabora.com 580 580 + script: 581 581 + # Prep the source tree 582 582 + - git clean -dfx 583 583 + # Call this script to build binary and source packages. 584 584 + # Can try locally by exporting the right variables and passing -B to get only a binary package to avoid complaints. 585 585 + - .gitlab-ci/build-and-submit-package.sh 586 586 + artifacts: 587 587 + paths: 588 588 + - "incoming/" 589 589 + expire_in: 2 days 590 590 + 529 591 reprepro:package: 530 592 stage: reprepro 531 593 extends: 532 532 - - .monado.image.ubuntu:focal 594 594 + - .monado.image.ubuntu:jammy 533 595 534 596 - .monado.packaging.conditions 535 597 needs: 536 598 - debian:bullseye:package 537 599 - ubuntu:focal:package 600 600 + - ubuntu:jammy:package 538 601 script: 539 602 - bash .gitlab-ci/reprepro.sh 540 603 artifacts:

+13 -2

.gitlab-ci/config.yml

··· 171 171 # LTS 172 172 - codename: focal 173 173 distro_version: "20.04" 174 174 + tag: "2022-07-25.1" 175 175 + deb_version_suffix: ubuntu2004 176 176 + packages: 177 177 + <<: *default_debian_packages 178 178 + build_jobs: 179 179 + - name: "ubuntu:focal:cmake" 180 180 + cmake_defines: 181 181 + BUILD_DOC: "OFF" 182 182 + 183 183 + - codename: jammy 184 184 + distro_version: "22.04" 174 185 tag: "2022-07-25.0" 175 175 - deb_version_suffix: ubuntu2004 186 186 + deb_version_suffix: ubuntu2204 176 187 packages: 177 188 <<: *default_debian_packages 178 189 reprepro: 179 190 build_jobs: 180 180 - - name: "ubuntu:cmake" 191 191 + - name: "ubuntu:jammy:cmake" 181 192 cmake_defines: 182 193 BUILD_DOC: "OFF" 183 194

+8

.gitlab-ci/distributions

··· 14 14 Tracking: minimal 15 15 SignWith: ${MONADO_GPG_FINGERPRINT} 16 16 17 17 + Origin: monado.freedesktop.org 18 18 + Description: Monado CI apt repository 19 19 + Codename: jammy 20 20 + Architectures: amd64 i386 source 21 21 + Components: main 22 22 + Tracking: minimal 23 23 + SignWith: ${MONADO_GPG_FINGERPRINT} 24 24 +

+10

.gitlab-ci/reprepro.sh

··· 49 49 else 50 50 echo "Skipping focal - no artifact found" 51 51 fi 52 52 + 53 53 + # jammy 54 54 + if [ -f "incoming/jammy.distro" ]; then 55 55 + VERSION=$(cat incoming/jammy.distro) 56 56 + echo "Signing and processing jammy: ${VERSION}" 57 57 + debsign -k "${MONADO_GPG_FINGERPRINT}" -p "gpg --batch --no-tty --yes --pinentry-mode loopback --passphrase ${MONADO_GPG_PASSPHRASE}" "incoming/monado_${VERSION}_amd64.changes" 58 58 + reprepro -V --ignore=wrongdistribution -b repo include jammy "incoming/monado_${VERSION}_amd64.changes" 59 59 + else 60 60 + echo "Skipping jammy - no artifact found" 61 61 + fi