summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2022-10-24 21:38:13 +0300
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2022-10-27 17:45:06 +0000
commit03772188061a9d6581305eacba7440e1b412b14f (patch)
tree38bc1183c1def816856c54b224de4d5a602c95de /.gitlab-ci.yml
parentd6ad95dbe2d1b5d8f9b8313c51eda77f6bba221d (diff)
downloadgstreamer-03772188061a9d6581305eacba7440e1b412b14f.tar.gz
ci: consolidate pre-build CI stages
Back in the day we kept separate stages around to define build order, however with DAG/needs now jobs run asynchronously. Additionally on recent version its possibel to same jobs depend on other jobs from the same stage. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3258>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml11
1 files changed, 4 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66f9943534..f2ed5497e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,7 @@ include:
- local: '.gitlab-image-tags.yml'
stages:
- - 'trigger'
- - 'build docker'
- 'preparation'
- - 'pre-build'
- 'build'
- 'test'
# Use the resulting binaries
@@ -103,7 +100,7 @@ default:
# This is an empty job that is used to trigger the pipeline.
trigger:
image: alpine:latest
- stage: 'trigger'
+ stage: 'preparation'
variables:
GIT_STRATEGY: none
script:
@@ -132,7 +129,7 @@ fedora amd64 docker:
extends:
- '.fedora image'
- '.fdo.container-build@fedora'
- stage: 'build docker'
+ stage: 'preparation'
needs:
- "trigger"
tags:
@@ -150,12 +147,12 @@ gst-indent amd64 docker:
extends:
- '.gst-indent image'
- '.fdo.container-build@debian'
- stage: 'build docker'
+ stage: 'preparation'
# Do not depend on the trigger, as we want to run indent always
needs: []
windows amd64 docker:
- stage: "build docker"
+ stage: "preparation"
needs:
- "trigger"
timeout: '3h'