mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: Update ci-templates

Browse source 
This includes an explicit way to specify the container architecture,
which fixes our rebuilds on ARMv7.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2025-01-21 16:20:05 +00:00
parent f246e619d1
commit 597a6b94f5
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -43,7 +43,7 @@ include:
# API changes. If you need new features from ci-templates you must bump # API changes. If you need new features from ci-templates you must bump
# this to the current SHA you require from the ci-templates repo, however # this to the current SHA you require from the ci-templates repo, however
# be aware that you may need to account for API changes when doing so. # be aware that you may need to account for API changes when doing so.
ref: b791bd48996e3ced9ca13f1c5ee82be8540b8adb ref: f210ea84576f756816da37908771edcee14ef7e6
file: file:
- '/templates/debian.yml' - '/templates/debian.yml'
- '/templates/freebsd.yml' - '/templates/freebsd.yml'
@ -82,7 +82,7 @@ workflow:
FDO_DISTRIBUTION_EXEC: 'pip3 install --break-system-packages meson~=0.57.2' FDO_DISTRIBUTION_EXEC: 'pip3 install --break-system-packages meson~=0.57.2'
# bump this tag every time you change something which requires rebuilding the # bump this tag every time you change something which requires rebuilding the
# base image # base image
FDO_DISTRIBUTION_TAG: "2024-03-28.2" FDO_DISTRIBUTION_TAG: "2025-01-21.1"
.debian-x86_64: .debian-x86_64:
extends: extends:
@ -101,6 +101,7 @@ workflow:
- .os-debian - .os-debian
variables: variables:
BUILD_ARCH: "armv7" BUILD_ARCH: "armv7"
FDO_DISTRIBUTION_PLATFORM: "linux/arm/v7"
# Does not inherit .ci-rules as we only want it to run in MR context. # Does not inherit .ci-rules as we only want it to run in MR context.
@ -154,7 +155,6 @@ armv7-debian-container_prep:
stage: "Base container" stage: "Base container"
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
FDO_BASE_IMAGE: "arm32v7/debian:$FDO_DISTRIBUTION_VERSION"
# Core build environment. # Core build environment.