From 6cc58c2fbe1253fbc7003da62539d9f60b925083 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <mail@manuelkieweg.de>
Date: Thu, 22 Oct 2020 09:55:55 +0100
Subject: [PATCH] fixed CI
---
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 25c44840c..8bf61180f 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -1,4 +1,5 @@
variables:
+ ACTIVE_DEVELOP: "v.0.1.0-codename-threadbare"
DOCKER_IMAGE_SHA: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
build:docker:
@@ -6,7 +7,7 @@ build:docker:
tags:
- baremetal
rules:
- - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
+ - if: $CI_COMMIT_BRANCH == $ACTIVE_DEVELOP
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
script:
- >
@@ -31,7 +32,7 @@ deploy:develop:
TAG: $CI_REGISTRY_IMAGE:develop
HOOK: $PORTAINER_HOOK_DEVELOP
rules:
- - if: $CI_COMMIT_BRANCH == "v.0.1.0-codename-threadbare"
+ - if: $CI_COMMIT_BRANCH == $ACTIVE_DEVELOP
<<: *deploy
deploy:tagged:
--
GitLab