From e3e3c11dd25f86a88da05f446f32be0b339a85db Mon Sep 17 00:00:00 2001 From: jem Date: Wed, 10 Feb 2021 14:23:58 +0100 Subject: [PATCH] test conditions --- .gitlab-ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8ba836..1b4c5c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,16 +72,13 @@ upload-release: test-prerelease: stage: test rules: - - if: $CI_COMMIT_TAG - when: never - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "master" && not($CI_COMMIT_TAG)' script: - echo $CI_COMMIT_TAG test-release: stage: test rules: - - if: $CI_COMMIT_TAG - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG' script: - echo $