From 46b5c27b8d15dd7dbab4e0e7ba74c281df48fceb Mon Sep 17 00:00:00 2001
From: caron <j.caron@fz-juelich.de>
Date: Tue, 3 Mar 2020 15:56:36 +0100
Subject: [PATCH] Next try to correct gitlab-ci.yaml
---
.gitlab-ci.yml | 6 +++---
docs/vis.rst | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db2a7a1..847b0e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,8 +58,8 @@ pages:
artifacts:
paths:
- public
- only: # Will be deprecated in the future, should then be replaced with rules (see pypi job)!
- - master
+ rules:
+ - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_TAG =~ /^\d+\.\d+(\.\d+)?$/'
pypi:
stage: deploy
@@ -72,4 +72,4 @@ pypi:
rules: # similar to only/except, but newer!
# Job is executed if branch is master AND if a tag is building which matches the regular expression!
# ONLY executes if commit to master has a tag, ^:start, $:end, valid example: "1.2.3", no "-dev" at the end!
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $CI_COMMIT_TAG =~ /^\d+\.\d+(\.\d+)?$/'
+ - if: '$CI_COMMIT_TAG =~ /^\d+\.\d+(\.\d+)?$/'
diff --git a/docs/vis.rst b/docs/vis.rst
index f0c4506..8cb785a 100644
--- a/docs/vis.rst
+++ b/docs/vis.rst
@@ -1,4 +1,4 @@
The vis visualization submodule
===============================
-vis docu here!
\ No newline at end of file
+vis docu here!
--
GitLab