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: Remove unneeded packages from buster and bullseye

Browse source
This commit is contained in:
Ryan Pavlik 2021-10-28 09:24:56 -05:00
parent 8dd6eea786
commit 8c96cf4a9f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitlab-ci.yml
View file

@ -28,13 +28,13 @@ variables:
.monado.variables.debian:buster: .monado.variables.debian:buster:
variables: variables:
FDO_DISTRIBUTION_VERSION: buster FDO_DISTRIBUTION_VERSION: buster
FDO_DISTRIBUTION_TAG: "2021-10-27.1" FDO_DISTRIBUTION_TAG: "2021-10-28.0"
# Variables for build and usage of Debian 11 (Bullseye) image # Variables for build and usage of Debian 11 (Bullseye) image
.monado.variables.debian:bullseye: .monado.variables.debian:bullseye:
variables: variables:
FDO_DISTRIBUTION_VERSION: bullseye FDO_DISTRIBUTION_VERSION: bullseye
FDO_DISTRIBUTION_TAG: "2021-10-27.1" FDO_DISTRIBUTION_TAG: "2021-10-28.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,8 +106,8 @@ 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 and reprepro # a list of packages to install - assembled from .monado.variables.debian-based-packages, plus clang-format-7
FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_PACKAGES} ${TOOLS_REQUIRED_PACKAGES} clang-format-7 reprepro" FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_PACKAGES} ${TOOLS_REQUIRED_PACKAGES} clang-format-7"
# Debian Bullseye (x64 + i386) # Debian Bullseye (x64 + i386)
debian:bullseye:container_prep: debian:bullseye:container_prep:
@ -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, plus reprepro # 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} reprepro" FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${PACKAGING_PACKAGES} ${TOOLS_REQUIRED_PACKAGES}"
# Arch Linux (x64) # Arch Linux (x64)
arch:container_prep: arch:container_prep: