From dfd31854535fbeb79a00bcc93c09f9dfb1cebc7f Mon Sep 17 00:00:00 2001
From: Henrik Askjer <henrik.askjer@uib.no>
Date: Wed, 29 Sep 2021 16:29:33 +0200
Subject: [PATCH] Modify deploy rules
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2b70cf3..3899b9a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,9 @@ deploy-dev:
- spraaksamlingene_01
stage: deploy
rules:
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ when: always
+ - if: $CI_PIPELINE_SOURCE == merge_request_event
when: always
when: manual
script:
--
GitLab