From 4b82d02c3156fd31102593e0c51b7be52dce8779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Nordstr=C3=B6m?= <totte.nordstrom@gmail.com>
Date: Fri, 21 Mar 2025 16:23:53 +0100
Subject: [PATCH 1/2] ci: make review deploy manual for branches while auto for
merge requests
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 570c53d4a..f403ac811 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -340,8 +340,10 @@ review:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+ when: manual
- if: $CI_MERGE_REQUEST_IID
- when: on_success
+ - allow_failure: true
stop_review:
stage: .post
@@ -355,11 +357,9 @@ stop_review:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
- when: manual
- allow_failure: true
- if: $CI_MERGE_REQUEST_IID
- when: manual
- allow_failure: true
+ - when: manual
+ - allow_failure: true
prod:
stage: deploy
--
GitLab
From 61ef3d60d9d4102b3d6d8a6b195e855fbef415a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Nordstr=C3=B6m?= <totte.nordstrom@gmail.com>
Date: Fri, 21 Mar 2025 17:36:57 +0100
Subject: [PATCH 2/2] chore: fixup
---
.gitlab-ci.yml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f403ac811..a6be03de2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -339,11 +339,11 @@ review:
when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
+ - if: $CI_MERGE_REQUEST_IID
+ when: on_success
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
when: manual
- - if: $CI_MERGE_REQUEST_IID
- - when: on_success
- - allow_failure: true
+ allow_failure: true
stop_review:
stage: .post
@@ -356,10 +356,12 @@ stop_review:
when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
- if: $CI_MERGE_REQUEST_IID
- - when: manual
- - allow_failure: true
+ when: manual
+ allow_failure: true
+ - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+ when: manual
+ allow_failure: true
prod:
stage: deploy
--
GitLab