Revert "Avoid duplication between ci_template.yml and .gitlab-ci.yml"

This reverts commit 6bdd1ead99e7d17ba5f8cdbba2668cdebc3bdb43.

This does not actually avoid duplication... [1]

[1] https://gitlab.freedesktop.org/gstreamer/gst-ci/commit/6bdd1ead99e7d17ba5f8cdbba2668cdebc3bdb43#note_81275

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d25b689..b1b0930 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,9 +121,15 @@ include: "gitlab/ci_template.yml"
 
 # Test the build job against the latest build image tag and the local manifest
 build fedora x86_64 local:
-  extends: '.build fedora x86_64'
+  extends: '.build'
   image: "${CI_REGISTRY_IMAGE}/amd64/fedora-build:latest"
+  dependencies:
+    - 'manifest'
 
-build android arm64 api28 local:
-  extends: '.build android arm64 api28'
+build ubuntu x86_64 local:
+  extends: '.build'
+  variables:
+    MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dlibav=disabled"
   image: "${CI_REGISTRY_IMAGE}/amd64/ubuntu-build:latest"
+  dependencies:
+    - 'manifest'

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index c64a0d9..ddf63ae 100644 (file)
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -62,13 +62,15 @@ manifest:
       - "manifest.xml"
       # - "gst-build/"
 
-.build fedora x86_64:
+build fedora x86_64:
   extends: '.build'
+  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora-build:2414895a53408ed8a0410a52560f8090b3f74696'
   dependencies:
     - "manifest"
 
-.build android arm64 api28:
+build android arm64 api28:
   extends: '.build'
+  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/ubuntu-build:a1726fee5841b776fcdaeda2e0ad628ce037a3c6'
   variables:
     MESON_ARGS: >
       -Dbad=enabled
@@ -76,11 +78,3 @@ manifest:
       --cross-file /android_arm64_28.txt
   dependencies:
     - "manifest"
-
-build fedora x86_64:
-  extends: '.build fedora x86_64'
-  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora-build:2414895a53408ed8a0410a52560f8090b3f74696'
-
-build android arm64 api28:
-  extends: '.build android arm64 api28'
-  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/ubuntu-build:a1726fee5841b776fcdaeda2e0ad628ce037a3c6'