[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] ci: Use built-in distribution image name mechanism

[PulseAudio Marge Bot (@pulseaudio-merge-bot)]

PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio


Commits:
c8af4920 by Arun Raghavan at 2023-04-21T16:04:14-04:00
ci: Use built-in distribution image name mechanism

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/789>

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.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 at 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



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/c8af4920f7831578677c2b3e83310679ee30053c

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/c8af4920f7831578677c2b3e83310679ee30053c
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20230421/30f98bb8/attachment.htm>