mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Add Ubuntu 20.04 test environments.

Browse source
This commit is contained in:
Ryan Pavlik 2020-05-06 17:27:14 -05:00 committed by Jakob Bornecrantz
parent 66aa55a2c5
commit 16ad2e4aeb
2 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.gitlab-ci.yml
View file

@ -20,6 +20,12 @@ variables:
FDO_DISTRIBUTION_VERSION: buster FDO_DISTRIBUTION_VERSION: buster
FDO_DISTRIBUTION_TAG: "2020-05-06.1" FDO_DISTRIBUTION_TAG: "2020-05-06.1"
# Variables for build and usage of Ubuntu 20.04 LTS (Focal) image
.monado.ubuntu:focal:
variables:
FDO_DISTRIBUTION_VERSION: "20.04"
FDO_DISTRIBUTION_TAG: "2020-05-06.0"
# Variables for build and usage of Debian 10 (Buster) + Android NDK image # Variables for build and usage of Debian 10 (Buster) + Android NDK image
.monado.debian:buster-ndk: .monado.debian:buster-ndk:
variables: variables:
@ -36,6 +42,9 @@ include:
- project: "freedesktop/ci-templates" - project: "freedesktop/ci-templates"
ref: *templates_sha ref: *templates_sha
file: "/templates/debian.yml" file: "/templates/debian.yml"
- project: "freedesktop/ci-templates"
ref: *templates_sha
file: "/templates/ubuntu.yml"
- project: "freedesktop/ci-templates" - project: "freedesktop/ci-templates"
ref: *templates_sha ref: *templates_sha
file: "/templates/arch.yml" file: "/templates/arch.yml"
@ -82,6 +91,17 @@ arch:container_prep:
# a list of packages to install # a list of packages to install
FDO_DISTRIBUTION_PACKAGES: "git gcc cmake meson ninja pkgconfig python3 diffutils patch doxygen graphviz eigen hidapi libxrandr mesa glslang vulkan-headers vulkan-icd-loader check glfw-x11 libusb opencv gtk3 ffmpeg v4l-utils qt5-base" FDO_DISTRIBUTION_PACKAGES: "git gcc cmake meson ninja pkgconfig python3 diffutils patch doxygen graphviz eigen hidapi libxrandr mesa glslang vulkan-headers vulkan-icd-loader check glfw-x11 libusb opencv gtk3 ffmpeg v4l-utils qt5-base"
ubuntu:container_prep:
stage: container_prep
extends:
- .monado.ubuntu:focal # local - variables
- .monado.container_base # local
- .monado.debian-based-packages # local - variables
- .fdo.container-build@ubuntu # from ci-templates
variables:
# a list of packages to install - assembled from .monado.debian-based-packages
FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${TOOLS_REQUIRED_PACKAGES}"
# Debian Buster + the Android NDK in /opt/android-ndk # Debian Buster + the Android NDK in /opt/android-ndk
# The NDK itself gets installed by .gitlab-ci/ndk:container_prep.sh # The NDK itself gets installed by .gitlab-ci/ndk:container_prep.sh
ndk:container_prep: ndk:container_prep:
@ -172,12 +192,24 @@ arch:cmake:
- .fdo.distribution-image@arch # from ci-templates - .fdo.distribution-image@arch # from ci-templates
- .monado.build-cmake # local - .monado.build-cmake # local
ubuntu:cmake:
extends:
- .monado.ubuntu:focal # local
- .fdo.distribution-image@ubuntu # from ci-templates
- .monado.build-cmake # local
debian:meson: debian:meson:
extends: extends:
- .monado.debian:buster # local - .monado.debian:buster # local
- .fdo.distribution-image@debian # from ci-templates - .fdo.distribution-image@debian # from ci-templates
- .monado.build-meson # local - .monado.build-meson # local
ubuntu:meson:
extends:
- .monado.ubuntu:focal # local
- .fdo.distribution-image@ubuntu # from ci-templates
- .monado.build-meson # local
arch:meson: arch:meson:
extends: extends:
- .monado.arch:rolling # local - .monado.arch:rolling # local

6
.gitlab-ci/ubuntu:container_prep.sh Normal file
View file

@ -0,0 +1,6 @@
#!/bin/bash
(
cd $(dirname $0)
bash ./build-openxr-openhmd.sh
)