From: Jordan Petridis Date: Fri, 23 Nov 2018 16:59:04 +0000 (+0200) Subject: gitlab/ci_template.yml: add dependencies block to the .build template X-Git-Tag: 1.19.3~497^2~502 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bb429bbf01f5fdf43f30bf20f007d74645e33c8;p=platform%2Fupstream%2Fgstreamer.git gitlab/ci_template.yml: add dependencies block to the .build template --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1b0930..93419cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,13 +123,9 @@ include: "gitlab/ci_template.yml" build fedora x86_64 local: extends: '.build' 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" image: "${CI_REGISTRY_IMAGE}/amd64/ubuntu-build:latest" - dependencies: - - 'manifest' diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index ddf63ae..4e5ddf0 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -30,6 +30,8 @@ manifest: .build: stage: "build" + dependencies: + - "manifest" variables: CC: "ccache gcc" CXX: "ccache g++" @@ -65,8 +67,6 @@ manifest: build fedora x86_64: extends: '.build' image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora-build:2414895a53408ed8a0410a52560f8090b3f74696' - dependencies: - - "manifest" build android arm64 api28: extends: '.build' @@ -76,5 +76,3 @@ build android arm64 api28: -Dbad=enabled -Dbad:androidmedia=enabled --cross-file /android_arm64_28.txt - dependencies: - - "manifest"