From bfbffc73abe71c68dd88846330e14ec728f2a72c Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Mon, 27 Sep 2021 09:42:18 +0300
Subject: [PATCH] ci: remove duplicate keys

They are redefined/copied just below

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/931>
---
 .gitlab-ci.yml | 33 ++-------------------------------
 1 file 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'