From 6bdd1ead99e7d17ba5f8cdbba2668cdebc3bdb43 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 22 Nov 2018 16:47:35 -0500 Subject: [PATCH] Avoid duplication between ci_template.yml and .gitlab-ci.yml --- .gitlab-ci.yml | 12 +++--------- gitlab/ci_template.yml | 14 ++++++++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1b0930e3f..d25b68964e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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' diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index ddf63aed9d..c64a0d9b67 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -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'