Skip to content
Snippets Groups Projects
Commit 69e2acfd authored by Jan Caron's avatar Jan Caron
Browse files

Merge branch 'empyre-preparation-0.0' into 'master'

Next try to correct gitlab-ci.yaml

See merge request empyre/empyre!24
parents eb9028e6 4b7f937c
No related branches found
No related tags found
No related merge requests found
...@@ -58,8 +58,8 @@ pages: ...@@ -58,8 +58,8 @@ pages:
artifacts: artifacts:
paths: paths:
- public - public
only: # Will be deprecated in the future, should then be replaced with rules (see pypi job)! rules:
- master - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_TAG =~ /^\d+\.\d+(\.\d+)?$/'
pypi: pypi:
stage: deploy stage: deploy
...@@ -72,4 +72,4 @@ pypi: ...@@ -72,4 +72,4 @@ pypi:
rules: # similar to only/except, but newer! 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! # 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! # 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+)?$/'
The vis visualization submodule The vis visualization submodule
=============================== ===============================
vis docu here! vis docu here!
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment