mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2024-12-27 01:46:51 +00:00
ci: drop ubuntu 24.04 focal foosa
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2261>
This commit is contained in:
Simon Zeni
Marge Bot
parent
a628e14dd0
commit
b4f52d421e
|
|
@ -141,12 +141,6 @@ win:container_prep:
|
|||
FDO_DISTRIBUTION_TAG: "2024-07-02"
|
||||
FDO_REPO_SUFFIX: ndk
|
||||
|
||||
# Variables for build and usage of Ubuntu focal image
|
||||
.monado.variables.ubuntu:focal:
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: "20.04"
|
||||
FDO_DISTRIBUTION_TAG: "2024-01-16"
|
||||
|
||||
# Variables for build and usage of Ubuntu jammy image
|
||||
.monado.variables.ubuntu:jammy:
|
||||
variables:
|
||||
|
|
@ -207,17 +201,6 @@ debian:bookworm-ndk:container_prep:
|
|||
FDO_DISTRIBUTION_PACKAGES: 'ca-certificates cmake default-jdk-headless git glslang-tools libeigen3-dev meson ninja-build pkg-config python3 unzip wget'
|
||||
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/android_container_prep.sh'
|
||||
|
||||
# Make Ubuntu focal image
|
||||
ubuntu:focal:container_prep:
|
||||
stage: container_prep
|
||||
extends:
|
||||
- .container-rules
|
||||
- .monado.variables.ubuntu:focal
|
||||
- .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'
|
||||
|
||||
# Make Ubuntu jammy image
|
||||
ubuntu:jammy:container_prep:
|
||||
stage: container_prep
|
||||
|
|
@ -291,14 +274,6 @@ alpine:container_prep:
|
|||
- .build-rules
|
||||
|
||||
|
||||
# Base for using Ubuntu focal image
|
||||
.monado.image.ubuntu:focal:
|
||||
extends:
|
||||
- .monado.variables.ubuntu:focal
|
||||
- .fdo.distribution-image@ubuntu # from ci-templates
|
||||
- .build-rules
|
||||
|
||||
|
||||
# Base for using Ubuntu jammy image
|
||||
.monado.image.ubuntu:jammy:
|
||||
extends:
|
||||
|
|
@ -574,17 +549,6 @@ android:inProcessRelease:
|
|||
paths:
|
||||
- src/xrt/targets/openxr_android/build/outputs/apk/inProcess
|
||||
|
||||
ubuntu:focal:cmake:
|
||||
stage: build
|
||||
extends:
|
||||
- .monado.image.ubuntu:focal
|
||||
|
||||
script:
|
||||
|
||||
- .gitlab-ci/prebuild.sh
|
||||
- .gitlab-ci/ci-cmake-build.sh
|
||||
- cd build && ctest --output-on-failure
|
||||
|
||||
ubuntu:jammy:cmake:
|
||||
stage: build
|
||||
extends:
|
||||
|
|
@ -709,33 +673,6 @@ debian:bullseye:package:
|
|||
- "incoming/"
|
||||
expire_in: 2 days
|
||||
|
||||
ubuntu:focal:package:
|
||||
extends:
|
||||
- .monado.image.ubuntu:focal
|
||||
- .monado.packaging.conditions
|
||||
variables:
|
||||
GIT_STRATEGY: clone
|
||||
DEBFULLNAME: "Monado CI"
|
||||
DEBEMAIL: "rylie.pavlik@collabora.com"
|
||||
DISTRO: ubuntu
|
||||
CODENAME: focal
|
||||
DEB_VERSION_SUFFIX: ubuntu2004
|
||||
stage: package
|
||||
before_script:
|
||||
- git config --global user.name Monado CI
|
||||
- git config --global user.email rylie.pavlik@collabora.com
|
||||
script:
|
||||
- .gitlab-ci/prebuild.sh
|
||||
# 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:jammy:package:
|
||||
extends:
|
||||
- .monado.image.ubuntu:jammy
|
||||
|
|
@ -799,7 +736,6 @@ reprepro:package:
|
|||
needs:
|
||||
- debian:bookworm:package
|
||||
- debian:bullseye:package
|
||||
- ubuntu:focal:package
|
||||
- ubuntu:jammy:package
|
||||
- ubuntu:noble:package
|
||||
script:
|
||||
|
|
|
|||
|
|
@ -189,16 +189,6 @@ distributions:
|
|||
- name: ubuntu
|
||||
images:
|
||||
# LTS
|
||||
- codename: focal
|
||||
distro_version: "20.04"
|
||||
tag: "2024-01-16"
|
||||
deb_version_suffix: ubuntu2004
|
||||
packages:
|
||||
<<: *default_debian_packages
|
||||
build_jobs:
|
||||
- name: "ubuntu:focal:cmake"
|
||||
cmake_defines:
|
||||
|
||||
- codename: jammy
|
||||
distro_version: "22.04"
|
||||
tag: "2024-04-16"
|
||||
|
|
|
|||
|
|
@ -14,14 +14,6 @@ Components: main
|
|||
Tracking: minimal
|
||||
SignWith: ${MONADO_GPG_FINGERPRINT}
|
||||
|
||||
Origin: monado.freedesktop.org
|
||||
Description: Monado CI apt repository
|
||||
Codename: focal
|
||||
Architectures: amd64 i386 source
|
||||
Components: main
|
||||
Tracking: minimal
|
||||
SignWith: ${MONADO_GPG_FINGERPRINT}
|
||||
|
||||
Origin: monado.freedesktop.org
|
||||
Description: Monado CI apt repository
|
||||
Codename: jammy
|
||||
|
|
|
|||
|
|
@ -50,16 +50,6 @@ else
|
|||
echo "Skipping bullseye - no artifact found"
|
||||
fi
|
||||
|
||||
# focal
|
||||
if [ -f "incoming/focal.distro" ]; then
|
||||
VERSION=$(cat incoming/focal.distro)
|
||||
echo "Signing and processing focal: ${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 focal "incoming/monado_${VERSION}_amd64.changes"
|
||||
else
|
||||
echo "Skipping focal - no artifact found"
|
||||
fi
|
||||
|
||||
# jammy
|
||||
if [ -f "incoming/jammy.distro" ]; then
|
||||
VERSION=$(cat incoming/jammy.distro)
|
||||
|
|
|
|||
Loading…
Reference in a new issue