diff options
| author | Stéphane Cerveau <scerveau@collabora.com> | 2021-10-20 17:56:49 +0200 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-10-21 13:10:36 +0000 |
| commit | 47a4c74e9bbec660c61fb52e3cf268d23ccb3726 (patch) | |
| tree | 3f06059348d4c402bcf6219f14ec3cc1f86d30b7 /.gitlab-ci.yml | |
| parent | 7c3ce9c70da17c4497ca1b215e25803fb3dfa524 (diff) | |
| download | gstreamer-47a4c74e9bbec660c61fb52e3cf268d23ccb3726.tar.gz | |
ci: gstreamer-full: remove static build
The gstreamer-full jobs act as
static builds, no need to perform it twice.
gstreamer-full-minimal can be nodebug.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1215>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c18c18a5a..87572e1195 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -359,24 +359,6 @@ build nodebug fedora x86_64: variables: MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled -Dgstreamer:gst_debug=false -Domx=enabled -Dgst-omx:target=generic ${MESON_BUILDTYPE_ARGS} ${MESON_GST_WERROR}" -build static fedora x86_64: - extends: '.build fedora x86_64' - variables: - MESON_BUILDTYPE_ARGS: > - --default-library=static - -Dintrospection=disabled - -Ddoc=disabled - -Dpython=auto - -build static nodebug fedora x86_64: - extends: 'build nodebug fedora x86_64' - variables: - MESON_BUILDTYPE_ARGS: > - --default-library=static - -Dintrospection=disabled - -Ddoc=disabled - -Dpython=auto - build clang fedora x86_64: extends: '.build fedora x86_64' variables: @@ -534,9 +516,9 @@ integration testsuites fedora: TEST_SUITE: "validate ges" # gstreamer-full: -gstreamer-full: - extends: 'build static fedora x86_64' - stage: integrate +gstreamer-full static build: + extends: '.build fedora x86_64' + stage: 'build' variables: MESON_ARGS: > --default-library=static @@ -552,12 +534,14 @@ gstreamer-full: paths: - 'meson-logs/' -gstreamer-full-minimal: - extends: 'build static fedora x86_64' - stage: integrate +gstreamer-full-minimal static build: + extends: 'gstreamer-full static build' + stage: 'build' variables: MESON_ARGS: > --default-library=static + -Ddoc=disabled + -Dgstreamer:gst_debug=false -Dauto_features=disabled -Dgstreamer:check=enabled -Dtests=enabled |