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

ci: Add ubuntu groovy.

Browse source
This commit is contained in:
Ryan Pavlik 2021-03-19 09:58:06 -05:00
parent aca6980ffd
commit aa10e9c013
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
.gitlab-ci.yml
View file

@ -36,6 +36,12 @@ variables:
FDO_DISTRIBUTION_VERSION: "20.04" FDO_DISTRIBUTION_VERSION: "20.04"
FDO_DISTRIBUTION_TAG: "2021-02-23.0" FDO_DISTRIBUTION_TAG: "2021-02-23.0"
# Variables for build and usage of Ubuntu 20.10 (Groovy) image
.monado.variables.ubuntu:groovy:
variables:
FDO_DISTRIBUTION_VERSION: "20.10"
FDO_DISTRIBUTION_TAG: "2021-03-19.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.variables.debian:buster-ndk: .monado.variables.debian:buster-ndk:
variables: variables:
@ -114,6 +120,18 @@ ubuntu:container_prep:
# a list of packages to install - assembled from .monado.variables.debian-based-packages # a list of packages to install - assembled from .monado.variables.debian-based-packages
FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_PACKAGES} ${TOOLS_REQUIRED_PACKAGES}" FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_PACKAGES} ${TOOLS_REQUIRED_PACKAGES}"
# Ubuntu Groovy (x64)
ubuntu:groovy:container_prep:
stage: container_prep
extends:
- .monado.variables.ubuntu:focal
- .monado.variables.container-prep-base
- .monado.variables.debian-based-packages
- .fdo.container-build@ubuntu # from ci-templates
variables:
# a list of packages to install - assembled from .monado.variables.debian-based-packages
FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_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:
@ -351,6 +369,16 @@ ubuntu:focal:package:
PACKAGE_BRANCH: ubuntu/focal PACKAGE_BRANCH: ubuntu/focal
DISTRO: focal DISTRO: focal
ubuntu:groovy:package:
extends:
- .monado.variables.ubuntu:groovy
- .fdo.distribution-image@ubuntu # from ci-templates
- .monado.base-job.debuild
variables:
BACKPORT_SUFFIX: ubuntu20.04
PACKAGE_BRANCH: ubuntu/focal
DISTRO: focal
reprepro:package: reprepro:package:
stage: reprepro stage: reprepro
extends: extends:
@ -360,6 +388,7 @@ reprepro:package:
dependencies: dependencies:
- debian:buster:package - debian:buster:package
- ubuntu:focal:package - ubuntu:focal:package
- ubuntu:groovy:package
before_script: before_script:
# Convince gnupg to work properly in CI # Convince gnupg to work properly in CI
- mkdir -p ~/.gnupg && chmod 700 ~/.gnupg - mkdir -p ~/.gnupg && chmod 700 ~/.gnupg

5
.gitlab-ci/ubuntu_groovy_container_prep.sh Normal file
View file

@ -0,0 +1,5 @@
#!/bin/bash
# Copyright 2021, Collabora, Ltd. and the Monado contributors
# SPDX-License-Identifier: BSL-1.0
# Nothing really needed.