From 452029e94fdf2ec3d139d9eac441a1e03093b6d6 Mon Sep 17 00:00:00 2001
From: Henrik Askjer <henrik.askjer@uib.no>
Date: Wed, 29 Sep 2021 16:48:19 +0200
Subject: [PATCH] avoid linter warning

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a31a808..dfad611d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,8 @@ deploy-dev:
   rules:
   - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_PIPELINE_SOURCE == 'merge_request_event'
     when: always
-  - when: manual
+  - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != 'merge_request_event'
+    when: manual
   script:
   - rm -rf ~/.aws
   - mv  .aws ~/
-- 
GitLab