mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-02-15 10:10:07 +00:00
ci: Do clang-format on bullseye too now.
This commit is contained in:
parent
14ed993d80
commit
208690b115
|
@ -34,7 +34,7 @@ variables:
|
||||||
.monado.variables.debian:bullseye:
|
.monado.variables.debian:bullseye:
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: bullseye
|
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
|
# Variables for build and usage of Ubuntu 20.04 LTS (Focal) image
|
||||||
.monado.variables.ubuntu:focal:
|
.monado.variables.ubuntu:focal:
|
||||||
|
@ -106,7 +106,7 @@ debian:buster:container_prep:
|
||||||
- .monado.variables.debian-based-packages
|
- .monado.variables.debian-based-packages
|
||||||
- .fdo.container-build@debian # from ci-templates
|
- .fdo.container-build@debian # from ci-templates
|
||||||
variables:
|
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"
|
FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_PACKAGES} ${TOOLS_REQUIRED_PACKAGES} clang-format-7"
|
||||||
|
|
||||||
# Debian Bullseye (x64 + i386)
|
# Debian Bullseye (x64 + i386)
|
||||||
|
@ -118,8 +118,8 @@ debian:bullseye:container_prep:
|
||||||
- .monado.variables.debian-based-packages
|
- .monado.variables.debian-based-packages
|
||||||
- .fdo.container-build@debian # from ci-templates
|
- .fdo.container-build@debian # from ci-templates
|
||||||
variables:
|
variables:
|
||||||
# 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, plus clang-format.
|
||||||
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} clang-format"
|
||||||
|
|
||||||
# Arch Linux (x64)
|
# Arch Linux (x64)
|
||||||
arch:container_prep:
|
arch:container_prep:
|
||||||
|
@ -184,7 +184,7 @@ ndk:container_prep:
|
||||||
# Style check job
|
# Style check job
|
||||||
format-and-spellcheck:
|
format-and-spellcheck:
|
||||||
extends:
|
extends:
|
||||||
- .monado.variables.debian:buster
|
- .monado.variables.debian:bullseye
|
||||||
- .fdo.distribution-image@debian # from ci-templates
|
- .fdo.distribution-image@debian # from ci-templates
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
|
|
Loading…
Reference in a new issue