From 7b7341ed57b7a1b0d6a39e1b4761bf59728ad69a Mon Sep 17 00:00:00 2001
From: Henrik Askjer <henrik.askjer@uib.no>
Date: Wed, 29 Sep 2021 16:24:37 +0200
Subject: [PATCH] Make deploy-dev automatic on detached pipeline
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index befdd9b7..d2b70cf3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,8 @@ build-dev:
- if: $CI_COMMIT_TAG == null
when: always
script:
+ - echo $CI_COMMIT_BRANCH
+ - echo $CI_PIPELINE_SOURCE
- echo "VUE_APP_VERSION_LABEL=$CI_COMMIT_BRANCH" >> .env.dev_server
- npm install --progress=false
- npm run build -- --mode dev_server
@@ -41,9 +43,8 @@ deploy-dev:
- spraaksamlingene_01
stage: deploy
rules:
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
- - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
when: manual
script:
- rm -rf ~/.aws
--
GitLab