ci: Use built-in distribution image name mechanism

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/789>
This commit is contained in:
Arun Raghavan 2023-04-21 16:01:15 -04:00
parent 39ff05e96d
commit c8af4920f7

View file

@ -22,7 +22,6 @@ variables:
FDO_DISTRIBUTION_TAG: '2023-04-21-00' FDO_DISTRIBUTION_TAG: '2023-04-21-00'
FDO_DISTRIBUTION_VERSION: '20.04' FDO_DISTRIBUTION_VERSION: '20.04'
FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio' FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio'
UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
include: include:
# We pull templates from master to avoid the overhead of periodically # We pull templates from master to avoid the overhead of periodically
@ -88,8 +87,8 @@ build-container:
wget wget
build-meson: build-meson:
extends: .fdo.distribution-image@ubuntu
stage: build stage: build
image: $UBUNTU_IMAGE
script: script:
# Install meson # Install meson
- wget -q https://github.com/mesonbuild/meson/releases/download/0.50.0/meson-0.50.0.tar.gz - wget -q https://github.com/mesonbuild/meson/releases/download/0.50.0/meson-0.50.0.tar.gz