diff options
| author | Jordan Petridis <jordan@centricular.com> | 2021-09-27 09:42:18 +0300 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2021-10-05 23:14:56 +0300 |
| commit | bfbffc73abe71c68dd88846330e14ec728f2a72c (patch) | |
| tree | 2cc7c7f654913b4ba416a4018d883ef442b783f0 /.gitlab-ci.yml | |
| parent | 8f39de328342ac38ee37cdbb81512916c3a5bda5 (diff) | |
| download | gstreamer-bfbffc73abe71c68dd88846330e14ec728f2a72c.tar.gz | |
ci: remove duplicate keys
They are redefined/copied just below
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/931>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40135deb8a..5d9329b0da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -432,37 +432,6 @@ check allow-edit: CCACHE_MAXSIZE: '10G' CARGO_HOME: '/cache/gstreamer/cargo' -.simple_fedora_build: &simple_build >- - ${DEFAULT_MESON_ARGS} - -Dsharp=enabled - -Domx=enabled - -Dgst-omx:target=generic - -Ddoc=disabled - -Drs=disabled - ${MESON_BUILDTYPE_ARGS} - ${MESON_GST_WERROR} - -.build: - stage: 'build' - extends: - - '.build_ccache_vars' - needs: - - "trigger" - # Taking into account the slowest shared runner + time needed to upload the binaries to artifacts - # Also need to take into account I/O of pulling docker images and uploading artifacts - timeout: '45min' - variables: - MESON_ARGS: "${DEFAULT_MESON_ARGS} ${MESON_BUILDTYPE_ARGS} ${MESON_GST_WERROR}" - script: - *build - after_script: - - mv build/meson-logs/ meson-logs - artifacts: - expire_in: "7 days" - when: "always" - paths: - - 'meson-logs/' - .base_modules_changes: &modules_changes - .gitlab-ci.yml - meson.build @@ -496,6 +465,8 @@ check allow-edit: stage: 'build' extends: - '.build_ccache_vars' + needs: + - "trigger" # Taking into account the slowest shared runner + time needed to upload the binaries to artifacts # Also need to take into account I/O of pulling docker images and uploading artifacts timeout: '45min' |