mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-29 01:48:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Do clang-format on bullseye too now.

Browse source
This commit is contained in:
Ryan Pavlik 2021-11-04 12:53:19 -05:00
parent 14ed993d80
commit 208690b115
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -34,7 +34,7 @@ variables:
.monado.variables.debian:bullseye:
variables:
FDO_DISTRIBUTION_VERSION: bullseye
FDO_DISTRIBUTION_TAG: "2021-10-28.0"
FDO_DISTRIBUTION_TAG: "2021-11-04.0"
# Variables for build and usage of Ubuntu 20.04 LTS (Focal) image
.monado.variables.ubuntu:focal:
@ -106,7 +106,7 @@ debian:buster:container_prep:
- .monado.variables.debian-based-packages
- .fdo.container-build@debian # from ci-templates
variables:
# a list of packages to install - assembled from .monado.variables.debian-based-packages, plus clang-format-7
# a list of packages to install - assembled from .monado.variables.debian-based-packages, plus clang-format-7 (which we don't actually need anymore)
FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_PACKAGES} ${TOOLS_REQUIRED_PACKAGES} clang-format-7"
# Debian Bullseye (x64 + i386)
@ -118,8 +118,8 @@ debian:bullseye:container_prep:
- .monado.variables.debian-based-packages
- .fdo.container-build@debian # 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}"
# a list of packages to install - assembled from .monado.variables.debian-based-packages, plus clang-format.
FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_PACKAGES} ${TOOLS_REQUIRED_PACKAGES} clang-format"
# Arch Linux (x64)
arch:container_prep:
@ -184,7 +184,7 @@ ndk:container_prep:
# Style check job
format-and-spellcheck:
extends:
- .monado.variables.debian:buster
- .monado.variables.debian:bullseye
- .fdo.distribution-image@debian # from ci-templates
stage: build
script: