summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <arun@asymptotic.io>2023-04-21 16:01:15 -0400
committerArun Raghavan <arun@asymptotic.io>2023-04-21 16:04:14 -0400
commitc8af4920f7831578677c2b3e83310679ee30053c (patch)
tree26f16696e76fa1c81adcc912781e61f255f2dba0
parent39ff05e96d6a835efef3a3f0943292a74fd2ed0c (diff)
downloadpulseaudio-c8af4920f7831578677c2b3e83310679ee30053c.tar.gz
ci: Use built-in distribution image name mechanism
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/789>
-rw-r--r--.gitlab-ci.yml3
1 files changed, 1 insertions, 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