Verified Commit 67fcaad2 authored by Jordan Petridіs's avatar Jordan Petridіs 🌱

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

This reverts commit 6bdd1ead.

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

[1] gstreamer/gst-ci@6bdd1ead (comment 81275)
parent 6bdd1ead
......@@ -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'
......@@ -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'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment