mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 19:42:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

gitlab/ci_template.yml: add dependencies block to the .build template

Browse source
This commit is contained in:
Jordan Petridis 2018-11-23 18:59:04 +02:00
parent 67fcaad29e
commit 2bb429bbf0
No known key found for this signature in database
GPG key ID: 902CC06D159744F5
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -123,13 +123,9 @@ include: "gitlab/ci_template.yml"
build fedora x86_64 local: build fedora x86_64 local:
extends: '.build' extends: '.build'
image: "${CI_REGISTRY_IMAGE}/amd64/fedora-build:latest" image: "${CI_REGISTRY_IMAGE}/amd64/fedora-build:latest"
dependencies:
- 'manifest'
build ubuntu x86_64 local: build ubuntu x86_64 local:
extends: '.build' extends: '.build'
variables: variables:
MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dlibav=disabled" MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dlibav=disabled"
image: "${CI_REGISTRY_IMAGE}/amd64/ubuntu-build:latest" image: "${CI_REGISTRY_IMAGE}/amd64/ubuntu-build:latest"
dependencies:
- 'manifest'

6
gitlab/ci_template.yml
View file

@ -30,6 +30,8 @@ manifest:
.build: .build:
stage: "build" stage: "build"
dependencies:
- "manifest"
variables: variables:
CC: "ccache gcc" CC: "ccache gcc"
CXX: "ccache g++" CXX: "ccache g++"
@ -65,8 +67,6 @@ manifest:
build fedora x86_64: build fedora x86_64:
extends: '.build' extends: '.build'
image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora-build:2414895a53408ed8a0410a52560f8090b3f74696' image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora-build:2414895a53408ed8a0410a52560f8090b3f74696'
dependencies:
- "manifest"
build android arm64 api28: build android arm64 api28:
extends: '.build' extends: '.build'
@ -76,5 +76,3 @@ build android arm64 api28:
-Dbad=enabled -Dbad=enabled
-Dbad:androidmedia=enabled -Dbad:androidmedia=enabled
--cross-file /android_arm64_28.txt --cross-file /android_arm64_28.txt
dependencies:
- "manifest"