From 47d07c48990fc296a3a4078404a2547164a67250 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 7 Aug 2019 12:40:27 -0400 Subject: [PATCH] Move to Fedora 30 --- gitlab/ci_template.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index 73b4d1a..01fc6d0 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -9,8 +9,7 @@ stages: variables: ANDROID_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/android:2019-06-12-354260' CERBERO_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/cerbero-fedora:2019-06-06-343857' - FEDORA_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:2019-03-26-196223' - FEDORA30_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:2019-05-29-324578' + FEDORA_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:2019-05-29-324578' INDENT_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/gst-indent:6f7e01e1e30a73efa880acdc8e911f1f20c58dbb' MANIFEST_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/build-manifest:d19082b72667fb3382bdc3621520c4d26e258b2e' @@ -134,7 +133,7 @@ build fedora x86_64: build nodebug fedora x86_64: extends: '.build' stage: 'build' - image: $FEDORA30_IMAGE + image: $FEDORA_IMAGE variables: MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled -Dgstreamer:gst_debug=false -Domx=enabled -Dgst-omx:target=generic -Ddoc=enabled ${MESON_BUILDTYPE_ARGS}" @@ -690,7 +689,7 @@ build cerbero ios universal: - $CI_PROJECT_NAME == "gst-sharp" documentation: - image: $FEDORA30_IMAGE + image: $FEDORA_IMAGE dependencies: - 'build nodebug fedora x86_64' stage: integrate -- 2.7.4