diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db2a7a1220cb9f5d32b285e7458dff04147edb63..847b0e0aff4130b5f391af897c00e59182720c74 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 f0c4506d50d3502c39c4de1245177f67db5ca53c..8cb785a62281372c7d12aa6d8290036fdd5dd189 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!