From 17fc9a66d4f1648db2f90066ded11f4419d2c229 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 11 Sep 2019 13:15:21 +0530 Subject: [PATCH] gitlab: Rename all cross jobs to have a cross- prefix For consistency, and to differentiate, f.ex., cross-windows jobs from native windows jobs. --- .gitlab-ci.yml | 10 ++++---- gitlab/ci_template.yml | 64 +++++++++++++++++++++++++------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38aeb93..794c5de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,8 +135,8 @@ build cerbero fedora x86_64 local: refs: - "master@gstreamer/gst-ci" -build cerbero android universal local: - extends: '.cerbero android universal' +build cerbero cross-android universal local: + extends: '.cerbero cross-android universal' image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest" when: 'manual' except: @@ -174,11 +174,11 @@ check fedora local: variables: TEST_SUITE: 'check.gst*' -android universal examples local: - extends: '.android universal examples' +cross-android universal examples local: + extends: '.cross-android universal examples' image: "${CI_REGISTRY_IMAGE}/amd64/android:latest" dependencies: - - "build cerbero android universal local" + - "build cerbero cross-android universal local" when: 'manual' except: refs: diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index d116f26..1a56f05 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -529,30 +529,30 @@ build cerbero fedora x86_64: # # Cerbero Android Universal build # -cerbero deps android universal: +cerbero deps cross-android universal: extends: '.cerbero deps' variables: CONFIG: "cross-android-universal.cbc" ARCH: "android_universal" -.cerbero android universal: +.cerbero cross-android universal: extends: '.cerbero' variables: CONFIG: "cross-android-universal.cbc" -cerbero android universal: - extends: '.cerbero android universal' +cerbero cross-android universal: + extends: '.cerbero cross-android universal' needs: - - "cerbero deps android universal" + - "cerbero deps cross-android universal" - "manifest" dependencies: - - "cerbero deps android universal" + - "cerbero deps cross-android universal" only: variables: - $CI_PROJECT_NAME == "cerbero" -build cerbero android universal: - extends: '.cerbero android universal' +build cerbero cross-android universal: + extends: '.cerbero cross-android universal' except: variables: - $CI_PROJECT_NAME == "cerbero" @@ -631,7 +631,7 @@ build cerbero cross win64: # # Build an Android App using the android binaries # -.android universal examples: +.cross-android universal examples: image: $ANDROID_IMAGE stage: 'integrate' variables: @@ -670,13 +670,13 @@ build cerbero cross win64: - "manifest.xml" - "${EXAMPLES_HOME}/outputs" -android universal examples: - extends: ".android universal examples" +cross-android universal examples: + extends: ".cross-android universal examples" needs: - - "build cerbero android universal" + - "build cerbero cross-android universal" - "manifest" dependencies: - - "build cerbero android universal" + - "build cerbero cross-android universal" except: variables: - $CI_PROJECT_NAME == "cerbero" @@ -686,13 +686,13 @@ android universal examples: - $CI_PROJECT_NAME == "gstreamer-vaapi" - $CI_PROJECT_NAME == "gst-docs" -cerbero android universal examples: - extends: ".android universal examples" +cerbero cross-android universal examples: + extends: ".cross-android universal examples" needs: - - "cerbero android universal" + - "cerbero cross-android universal" - "manifest" dependencies: - - "cerbero android universal" + - "cerbero cross-android universal" only: variables: - $CI_PROJECT_NAME == "cerbero" @@ -756,7 +756,7 @@ build cerbero macos x86_64: # # Cerbero iOS build # -cerbero deps ios universal: +cerbero deps cross-ios universal: extends: '.cerbero deps' variables: ARCH: "ios_universal" @@ -766,7 +766,7 @@ cerbero deps ios universal: tags: - gst-ios-12.2 -.cerbero ios universal: +.cerbero cross-ios universal: extends: '.cerbero' variables: ARCH: "ios_universal" @@ -785,19 +785,19 @@ cerbero deps ios universal: - "${CERBERO_HOME}/logs" - "gstreamer-1.0-*-ios-universal.pkg" -cerbero ios universal: - extends: '.cerbero ios universal' +cerbero cross-ios universal: + extends: '.cerbero cross-ios universal' needs: - - "cerbero deps ios universal" + - "cerbero deps cross-ios universal" - "manifest" dependencies: - - "cerbero deps ios universal" + - "cerbero deps cross-ios universal" only: variables: - $CI_PROJECT_NAME == "cerbero" -build cerbero ios universal: - extends: '.cerbero ios universal' +build cerbero cross-ios universal: + extends: '.cerbero cross-ios universal' when: 'manual' except: variables: @@ -839,7 +839,7 @@ documentation: # # Build an iOS App using the iOS binaries # -.ios universal examples: +.cross-ios universal examples: stage: 'integrate' when: 'manual' variables: @@ -877,10 +877,10 @@ documentation: tags: - gst-ios-12.2 -ios universal examples: - extends: ".ios universal examples" +cross-ios universal examples: + extends: ".cross-ios universal examples" dependencies: - - "build cerbero ios universal" + - "build cerbero cross-ios universal" except: variables: - $CI_PROJECT_NAME == "cerbero" @@ -889,10 +889,10 @@ ios universal examples: - $CI_PROJECT_NAME == "gst-integration-testsuites" - $CI_PROJECT_NAME == "gstreamer-vaapi" -cerbero ios universal examples: - extends: ".ios universal examples" +cerbero cross-ios universal examples: + extends: ".cross-ios universal examples" dependencies: - - "cerbero ios universal" + - "cerbero cross-ios universal" only: variables: - $CI_PROJECT_NAME == "cerbero" -- 2.7.4