From 791a8341988e51ebaa22417c8fb8181ed7339f36 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Tue, 1 Dec 2020 16:08:26 +0000
Subject: [PATCH] Fixed pipeline
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d89241641..fdc538aa9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ config:unstable:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"'
when: manual
- if: '$CI_COMMIT_BRANCH == "develop"'
- when: always
+ when: on_success
needs: ["builder:unstable"]
script:
- bash containers/release/configure_release.sh unstable
@@ -90,7 +90,7 @@ release:unstable:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"'
when: manual
- if: '$CI_COMMIT_BRANCH == "develop"'
- when: always
+ when: on_success
needs: ["config:unstable"]
script:
- cp config/Dockerfile containers/release/Dockerfile
@@ -105,7 +105,7 @@ release:singularity:
- silicon
rules:
- if: '$CI_COMMIT_TAG'
- when: always
+ when: on_success
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
needs: ["release:stable"]
--
GitLab