mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-05 06:58:56 +00:00
Move to Fedora 30
This commit is contained in:
parent
7e88d99f95
commit
47d07c4899
1 changed files with 3 additions and 4 deletions
|
@ -9,8 +9,7 @@ stages:
|
||||||
variables:
|
variables:
|
||||||
ANDROID_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/android:2019-06-12-354260'
|
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'
|
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'
|
FEDORA_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:2019-05-29-324578'
|
||||||
FEDORA30_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'
|
INDENT_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/gst-indent:6f7e01e1e30a73efa880acdc8e911f1f20c58dbb'
|
||||||
MANIFEST_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/build-manifest:d19082b72667fb3382bdc3621520c4d26e258b2e'
|
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:
|
build nodebug fedora x86_64:
|
||||||
extends: '.build'
|
extends: '.build'
|
||||||
stage: 'build'
|
stage: 'build'
|
||||||
image: $FEDORA30_IMAGE
|
image: $FEDORA_IMAGE
|
||||||
variables:
|
variables:
|
||||||
MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled -Dgstreamer:gst_debug=false -Domx=enabled -Dgst-omx:target=generic -Ddoc=enabled ${MESON_BUILDTYPE_ARGS}"
|
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"
|
- $CI_PROJECT_NAME == "gst-sharp"
|
||||||
|
|
||||||
documentation:
|
documentation:
|
||||||
image: $FEDORA30_IMAGE
|
image: $FEDORA_IMAGE
|
||||||
dependencies:
|
dependencies:
|
||||||
- 'build nodebug fedora x86_64'
|
- 'build nodebug fedora x86_64'
|
||||||
stage: integrate
|
stage: integrate
|
||||||
|
|
Loading…
Reference in a new issue