diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ec0652a3..58fd8a80d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,18 +45,6 @@ include: FDO_DISTRIBUTION_VERSION: "20.04" FDO_DISTRIBUTION_TAG: "2022-04-22.0" -# Variables for build and usage of Ubuntu hirsute image -.monado.variables.ubuntu:hirsute: - variables: - FDO_DISTRIBUTION_VERSION: "21.04" - FDO_DISTRIBUTION_TAG: "2022-04-22.0" - -# Variables for build and usage of Ubuntu impish image -.monado.variables.ubuntu:impish: - variables: - FDO_DISTRIBUTION_VERSION: "21.10" - FDO_DISTRIBUTION_TAG: "2022-04-22.0" - # Variables for build and usage of Arch rolling image .monado.variables.arch:rolling: variables: @@ -108,30 +96,6 @@ ubuntu:focal:container_prep: only: changes: - .gitlab-ci/**/* - variables: - FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libavcodec-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' - -# Make Ubuntu hirsute image -ubuntu:hirsute:container_prep: - stage: container_prep - extends: - - .monado.variables.ubuntu:hirsute - - .fdo.container-build@ubuntu # from ci-templates - only: - changes: - - .gitlab-ci/**/* - variables: - FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libavcodec-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' - -# Make Ubuntu impish image -ubuntu:impish:container_prep: - stage: container_prep - extends: - - .monado.variables.ubuntu:impish - - .fdo.container-build@ubuntu # from ci-templates - only: - changes: - - .gitlab-ci/**/* variables: FDO_DISTRIBUTION_PACKAGES: 'build-essential ca-certificates cmake curl debhelper devscripts dput-ng gettext-base git glslang-tools libavcodec-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' @@ -171,20 +135,6 @@ arch:rolling:container_prep: - .fdo.distribution-image@ubuntu # from ci-templates -# Base for using Ubuntu hirsute image -.monado.image.ubuntu:hirsute: - extends: - - .monado.variables.ubuntu:hirsute - - .fdo.distribution-image@ubuntu # from ci-templates - - -# Base for using Ubuntu impish image -.monado.image.ubuntu:impish: - extends: - - .monado.variables.ubuntu:impish - - .fdo.distribution-image@ubuntu # from ci-templates - - # Base for using Arch rolling image .monado.image.arch:rolling: extends: @@ -478,17 +428,6 @@ ubuntu:cmake: - ninja -C build - cd build && ctest --output-on-failure -ubuntu:latest:cmake: - stage: build - extends: - - .monado.image.ubuntu:impish - script: - - rm -rf build - - cmake -GNinja -B build -S . -DBUILD_DOC=OFF - - echo "Build Options:"; grep "^XRT_" build/CMakeCache.txt - - ninja -C build - - cd build && ctest --output-on-failure - arch:cmake: stage: build extends: @@ -587,69 +526,15 @@ ubuntu:focal:package: - "incoming/" expire_in: 2 days -ubuntu:hirsute:package: - extends: - - .monado.image.ubuntu:hirsute - - .monado.packaging.conditions - variables: - GIT_STRATEGY: clone - DEBFULLNAME: "Monado CI" - DEBEMAIL: "ryan.pavlik@collabora.com" - DISTRO: ubuntu - CODENAME: hirsute - DEB_VERSION_SUFFIX: ubuntu2104 - stage: package - before_script: - - git config --global user.name Monado CI - - git config --global user.email ryan.pavlik@collabora.com - script: - # Prep the source tree - - git clean -dfx - # Call this script to build binary and source packages. - # Can try locally by exporting the right variables and passing -B to get only a binary package to avoid complaints. - - .gitlab-ci/build-and-submit-package.sh - artifacts: - paths: - - "incoming/" - expire_in: 2 days - -ubuntu:impish:package: - extends: - - .monado.image.ubuntu:impish - - .monado.packaging.conditions - variables: - GIT_STRATEGY: clone - DEBFULLNAME: "Monado CI" - DEBEMAIL: "ryan.pavlik@collabora.com" - DISTRO: ubuntu - CODENAME: impish - DEB_VERSION_SUFFIX: ubuntu2110 - stage: package - before_script: - - git config --global user.name Monado CI - - git config --global user.email ryan.pavlik@collabora.com - script: - # Prep the source tree - - git clean -dfx - # Call this script to build binary and source packages. - # Can try locally by exporting the right variables and passing -B to get only a binary package to avoid complaints. - - .gitlab-ci/build-and-submit-package.sh - artifacts: - paths: - - "incoming/" - expire_in: 2 days - reprepro:package: stage: reprepro extends: - - .monado.image.ubuntu:impish + - .monado.image.ubuntu:focal - .monado.packaging.conditions needs: - debian:bullseye:package - ubuntu:focal:package - - ubuntu:hirsute:package - - ubuntu:impish:package script: - bash .gitlab-ci/reprepro.sh artifacts: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index f30b817f9..8e077b312 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -172,29 +172,11 @@ distributions: distro_version: "20.04" tag: "2022-04-22.0" deb_version_suffix: ubuntu2004 - packages: - <<: *default_debian_packages - build_jobs: - - name: "ubuntu:cmake" - cmake_defines: - BUILD_DOC: "OFF" - - - codename: hirsute - distro_version: "21.04" - tag: "2022-04-22.0" - deb_version_suffix: ubuntu2104 - packages: - <<: *default_debian_packages - - - codename: impish - distro_version: "21.10" - tag: "2022-04-22.0" - deb_version_suffix: ubuntu2110 packages: <<: *default_debian_packages reprepro: build_jobs: - - name: "ubuntu:latest:cmake" + - name: "ubuntu:cmake" cmake_defines: BUILD_DOC: "OFF" diff --git a/.gitlab-ci/distributions b/.gitlab-ci/distributions index 88316960b..daff99b39 100644 --- a/.gitlab-ci/distributions +++ b/.gitlab-ci/distributions @@ -14,19 +14,3 @@ Components: main Tracking: minimal SignWith: ${MONADO_GPG_FINGERPRINT} -Origin: monado.freedesktop.org -Description: Monado CI apt repository -Codename: hirsute -Architectures: amd64 i386 source -Components: main -Tracking: minimal -SignWith: ${MONADO_GPG_FINGERPRINT} - -Origin: monado.freedesktop.org -Description: Monado CI apt repository -Codename: impish -Architectures: amd64 i386 source -Components: main -Tracking: minimal -SignWith: ${MONADO_GPG_FINGERPRINT} - diff --git a/.gitlab-ci/reprepro.sh b/.gitlab-ci/reprepro.sh index 1f9312ac6..87ffa89e1 100755 --- a/.gitlab-ci/reprepro.sh +++ b/.gitlab-ci/reprepro.sh @@ -49,23 +49,3 @@ if [ -f "incoming/focal.distro" ]; then else echo "Skipping focal - no artifact found" fi - -# hirsute -if [ -f "incoming/hirsute.distro" ]; then - VERSION=$(cat incoming/hirsute.distro) - echo "Signing and processing hirsute: ${VERSION}" - debsign -k "${MONADO_GPG_FINGERPRINT}" -p "gpg --batch --no-tty --yes --pinentry-mode loopback --passphrase ${MONADO_GPG_PASSPHRASE}" "incoming/monado_${VERSION}_amd64.changes" - reprepro -V --ignore=wrongdistribution -b repo include hirsute "incoming/monado_${VERSION}_amd64.changes" -else - echo "Skipping hirsute - no artifact found" -fi - -# impish -if [ -f "incoming/impish.distro" ]; then - VERSION=$(cat incoming/impish.distro) - echo "Signing and processing impish: ${VERSION}" - debsign -k "${MONADO_GPG_FINGERPRINT}" -p "gpg --batch --no-tty --yes --pinentry-mode loopback --passphrase ${MONADO_GPG_PASSPHRASE}" "incoming/monado_${VERSION}_amd64.changes" - reprepro -V --ignore=wrongdistribution -b repo include impish "incoming/monado_${VERSION}_amd64.changes" -else - echo "Skipping impish - no artifact found" -fi