Commit 6bdd1ead authored by Xavier Claessens's avatar Xavier Claessens

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

parent 1f326e26
......@@ -121,15 +121,9 @@ 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'
extends: '.build fedora x86_64'
image: "${CI_REGISTRY_IMAGE}/amd64/fedora-build:latest"
dependencies:
- 'manifest'
build ubuntu x86_64 local:
extends: '.build'
variables:
MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dlibav=disabled"
build android arm64 api28 local:
extends: '.build android arm64 api28'
image: "${CI_REGISTRY_IMAGE}/amd64/ubuntu-build:latest"
dependencies:
- 'manifest'
......@@ -62,15 +62,13 @@ 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
......@@ -78,3 +76,11 @@ build android arm64 api28:
--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