diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-09-22 22:35:09 +0300 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-09-22 23:24:06 +0300 |
| commit | 86a19e376594b0454cdd33f9ee23d7a30110af27 (patch) | |
| tree | 77d843e1abd69c9d62da1c02b4a74d5bb52da15b /.gitlab-ci.yml | |
| parent | 814f279eebbc29b23f493425690a58c834ba18d5 (diff) | |
ci: Include image tag names from the main repo
Now we don't need to keep anything in sync manually.
Also fix the images_template.yml include while we're at it.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/875>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86e2bf89f..4366b27f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,17 +5,21 @@ include: ref: *templates_sha file: '/templates/debian.yml' - - remote: "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/raw/main/ci/images_template.yml" + - project: 'gstreamer/gstreamer-rs' + ref: main + file: '/ci/images_template.yml' + + - project: 'gstreamer/gstreamer' + ref: main + file: '/.gitlab-image-tags.yml' variables: FDO_UPSTREAM_REPO: gstreamer/gst-plugins-rs # We use GStreamer image to build the documentation as it is the simplest way # to ensure that we are testing against the same thing as GStreamer itself. - # - # This shouldn't be updated so often, only when big updates happen in - # GStreamer itself - GSTREAMER_DOC_IMAGE: registry.freedesktop.org/gstreamer/gstreamer/amd64/fedora:2022-09-22.0-main + # The tag name is included above from the main repo. + GSTREAMER_DOC_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/fedora:$FEDORA_TAG-main" WINDOWS_BASE: "registry.freedesktop.org/gstreamer/gstreamer-rs/windows" WINDOWS_RUST_MINIMUM_IMAGE: "$WINDOWS_BASE:$GST_RS_IMG_TAG-main-$GST_RS_MSRV" WINDOWS_RUST_STABLE_IMAGE: "$WINDOWS_BASE:$GST_RS_IMG_TAG-main-$GST_RS_STABLE" |