From 5a067f0ddc6cc5d50ed10b272199a6f5dd661f11 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Mon, 18 May 2020 01:22:04 +0200
Subject: [PATCH 1/3] [ci] fix wip regex
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 761c8caf2..3a8dfbe51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,6 @@ stages:
workflow:
rules:
- - if: $CI_COMMIT_REF_NAME =~ /^wip*/i
- when: never
- changes:
- .gitlab/**/*
- app/**/*
@@ -82,6 +80,8 @@ workflow:
tests:
<<: *env
rules:
+ - if: $CI_COMMIT_REF_NAME =~ /^wip*$/
+ when: manual
- if: $CI_COMMIT_TAG
when: never
- if: $CI_MERGE_REQUEST_ID
--
GitLab
From 125ba87fb5d76f4397a21ad66ab05b4d631225aa Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Tue, 19 May 2020 15:29:06 +0200
Subject: [PATCH 2/3] [ci] auto run tests on dev and releases branch
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a8dfbe51..d48136ea6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,8 +84,7 @@ tests:
when: manual
- if: $CI_COMMIT_TAG
when: never
- - if: $CI_MERGE_REQUEST_ID
- when: on_success
+ - if: '$CI_MERGE_REQUEST_ID ||$CI_COMMIT_BRANCH == "dev" || $CI_COMMIT_BRANCH =~ /^release/'
- when: manual
stage: tests
script:
--
GitLab
From 612c3b3e84a3b4ac80e32de2b91a3ff8fa62b018 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Tue, 19 May 2020 15:32:44 +0200
Subject: [PATCH 3/3] [ci] integration tests always manual
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d48136ea6..a81c571c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,7 +127,6 @@ audit_dependencies:
rules:
- if: $CI_COMMIT_TAG
when: never
- - if: $CI_MERGE_REQUEST_ID
- when: manual
sync_g1:
--
GitLab