mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 01:32:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

gitlab: Rename all cross jobs to have a cross- prefix

Browse source 
For consistency, and to differentiate, f.ex., cross-windows jobs from
native windows jobs.
This commit is contained in:
Nirbheek Chauhan 2019-09-11 13:15:21 +05:30
parent 53abd5e8fd
commit 17fc9a66d4
2 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -135,8 +135,8 @@ build cerbero fedora x86_64 local:
refs: refs:
- "master@gstreamer/gst-ci" - "master@gstreamer/gst-ci"
build cerbero android universal local: build cerbero cross-android universal local:
extends: '.cerbero android universal' extends: '.cerbero cross-android universal'
image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest" image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"
when: 'manual' when: 'manual'
except: except:
@ -174,11 +174,11 @@ check fedora local:
variables: variables:
TEST_SUITE: 'check.gst*' TEST_SUITE: 'check.gst*'
android universal examples local: cross-android universal examples local:
extends: '.android universal examples' extends: '.cross-android universal examples'
image: "${CI_REGISTRY_IMAGE}/amd64/android:latest" image: "${CI_REGISTRY_IMAGE}/amd64/android:latest"
dependencies: dependencies:
- "build cerbero android universal local" - "build cerbero cross-android universal local"
when: 'manual' when: 'manual'
except: except:
refs: refs:

64
gitlab/ci_template.yml
View file

@ -529,30 +529,30 @@ build cerbero fedora x86_64:
# #
# Cerbero Android Universal build # Cerbero Android Universal build
# #
cerbero deps android universal: cerbero deps cross-android universal:
extends: '.cerbero deps' extends: '.cerbero deps'
variables: variables:
CONFIG: "cross-android-universal.cbc" CONFIG: "cross-android-universal.cbc"
ARCH: "android_universal" ARCH: "android_universal"
.cerbero android universal: .cerbero cross-android universal:
extends: '.cerbero' extends: '.cerbero'
variables: variables:
CONFIG: "cross-android-universal.cbc" CONFIG: "cross-android-universal.cbc"
cerbero android universal: cerbero cross-android universal:
extends: '.cerbero android universal' extends: '.cerbero cross-android universal'
needs: needs:
- "cerbero deps android universal" - "cerbero deps cross-android universal"
- "manifest" - "manifest"
dependencies: dependencies:
- "cerbero deps android universal" - "cerbero deps cross-android universal"
only: only:
variables: variables:
- $CI_PROJECT_NAME == "cerbero" - $CI_PROJECT_NAME == "cerbero"
build cerbero android universal: build cerbero cross-android universal:
extends: '.cerbero android universal' extends: '.cerbero cross-android universal'
except: except:
variables: variables:
- $CI_PROJECT_NAME == "cerbero" - $CI_PROJECT_NAME == "cerbero"
@ -631,7 +631,7 @@ build cerbero cross win64:
# #
# Build an Android App using the android binaries # Build an Android App using the android binaries
# #
.android universal examples: .cross-android universal examples:
image: $ANDROID_IMAGE image: $ANDROID_IMAGE
stage: 'integrate' stage: 'integrate'
variables: variables:
@ -670,13 +670,13 @@ build cerbero cross win64:
- "manifest.xml" - "manifest.xml"
- "${EXAMPLES_HOME}/outputs" - "${EXAMPLES_HOME}/outputs"
android universal examples: cross-android universal examples:
extends: ".android universal examples" extends: ".cross-android universal examples"
needs: needs:
- "build cerbero android universal" - "build cerbero cross-android universal"
- "manifest" - "manifest"
dependencies: dependencies:
- "build cerbero android universal" - "build cerbero cross-android universal"
except: except:
variables: variables:
- $CI_PROJECT_NAME == "cerbero" - $CI_PROJECT_NAME == "cerbero"
@ -686,13 +686,13 @@ android universal examples:
- $CI_PROJECT_NAME == "gstreamer-vaapi" - $CI_PROJECT_NAME == "gstreamer-vaapi"
- $CI_PROJECT_NAME == "gst-docs" - $CI_PROJECT_NAME == "gst-docs"
cerbero android universal examples: cerbero cross-android universal examples:
extends: ".android universal examples" extends: ".cross-android universal examples"
needs: needs:
- "cerbero android universal" - "cerbero cross-android universal"
- "manifest" - "manifest"
dependencies: dependencies:
- "cerbero android universal" - "cerbero cross-android universal"
only: only:
variables: variables:
- $CI_PROJECT_NAME == "cerbero" - $CI_PROJECT_NAME == "cerbero"
@ -756,7 +756,7 @@ build cerbero macos x86_64:
# #
# Cerbero iOS build # Cerbero iOS build
# #
cerbero deps ios universal: cerbero deps cross-ios universal:
extends: '.cerbero deps' extends: '.cerbero deps'
variables: variables:
ARCH: "ios_universal" ARCH: "ios_universal"
@ -766,7 +766,7 @@ cerbero deps ios universal:
tags: tags:
- gst-ios-12.2 - gst-ios-12.2
.cerbero ios universal: .cerbero cross-ios universal:
extends: '.cerbero' extends: '.cerbero'
variables: variables:
ARCH: "ios_universal" ARCH: "ios_universal"
@ -785,19 +785,19 @@ cerbero deps ios universal:
- "${CERBERO_HOME}/logs" - "${CERBERO_HOME}/logs"
- "gstreamer-1.0-*-ios-universal.pkg" - "gstreamer-1.0-*-ios-universal.pkg"
cerbero ios universal: cerbero cross-ios universal:
extends: '.cerbero ios universal' extends: '.cerbero cross-ios universal'
needs: needs:
- "cerbero deps ios universal" - "cerbero deps cross-ios universal"
- "manifest" - "manifest"
dependencies: dependencies:
- "cerbero deps ios universal" - "cerbero deps cross-ios universal"
only: only:
variables: variables:
- $CI_PROJECT_NAME == "cerbero" - $CI_PROJECT_NAME == "cerbero"
build cerbero ios universal: build cerbero cross-ios universal:
extends: '.cerbero ios universal' extends: '.cerbero cross-ios universal'
when: 'manual' when: 'manual'
except: except:
variables: variables:
@ -839,7 +839,7 @@ documentation:
# #
# Build an iOS App using the iOS binaries # Build an iOS App using the iOS binaries
# #
.ios universal examples: .cross-ios universal examples:
stage: 'integrate' stage: 'integrate'
when: 'manual' when: 'manual'
variables: variables:
@ -877,10 +877,10 @@ documentation:
tags: tags:
- gst-ios-12.2 - gst-ios-12.2
ios universal examples: cross-ios universal examples:
extends: ".ios universal examples" extends: ".cross-ios universal examples"
dependencies: dependencies:
- "build cerbero ios universal" - "build cerbero cross-ios universal"
except: except:
variables: variables:
- $CI_PROJECT_NAME == "cerbero" - $CI_PROJECT_NAME == "cerbero"
@ -889,10 +889,10 @@ ios universal examples:
- $CI_PROJECT_NAME == "gst-integration-testsuites" - $CI_PROJECT_NAME == "gst-integration-testsuites"
- $CI_PROJECT_NAME == "gstreamer-vaapi" - $CI_PROJECT_NAME == "gstreamer-vaapi"
cerbero ios universal examples: cerbero cross-ios universal examples:
extends: ".ios universal examples" extends: ".cross-ios universal examples"
dependencies: dependencies:
- "cerbero ios universal" - "cerbero cross-ios universal"
only: only:
variables: variables:
- $CI_PROJECT_NAME == "cerbero" - $CI_PROJECT_NAME == "cerbero"