From 0d742e8b28ee7edcbf52df206aad6c4a3602e92f Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <mail@manuelkieweg.de>
Date: Wed, 3 Mar 2021 18:54:31 +0000
Subject: [PATCH] pipeline order
---
build/ci/.build-container.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index a25349eb5..771db4345 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -8,6 +8,7 @@ build:docker:
rules:
- if: $CI_COMMIT_BRANCH == "develop"
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
script:
- >
docker build \
@@ -44,14 +45,14 @@ deploy:latest:
deploy:merge-request:master:
variables:
- TAG: $CI_REGISTRY_IMAGE:develop
+ TAG: $CI_REGISTRY_IMAGE:mr-master
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
<<: *deploy
deploy:merge-mr:develop:
variables:
- TAG: $CI_REGISTRY_IMAGE:develop
+ TAG: $CI_REGISTRY_IMAGE:mr-develop
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop'
<<: *deploy
--
GitLab