From c8af4920f7831578677c2b3e83310679ee30053c Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Fri, 21 Apr 2023 16:01:15 -0400 Subject: ci: Use built-in distribution image name mechanism Part-of: --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa67678ce..6c12e397d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,6 @@ variables: FDO_DISTRIBUTION_TAG: '2023-04-21-00' FDO_DISTRIBUTION_VERSION: '20.04' FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio' - UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" include: # We pull templates from master to avoid the overhead of periodically @@ -88,8 +87,8 @@ build-container: wget build-meson: + extends: .fdo.distribution-image@ubuntu stage: build - image: $UBUNTU_IMAGE script: # Install meson - wget -q https://github.com/mesonbuild/meson/releases/download/0.50.0/meson-0.50.0.tar.gz -- cgit v1.2.1