Merge branch 'origin/release-2020' into merge-release-2020-into-master

[alexxy/gromacs.git] / admin / gitlab-ci / rules.gitlab-ci.yml

diff --git a/admin/gitlab-ci/rules.gitlab-ci.yml b/admin/gitlab-ci/rules.gitlab-ci.yml
index 201e329599112cfc23728ccc8cbe63922d158a2f..7bf1648b47f83a2508677c5ea10e9a723e99854d 100644 (file)
--- a/admin/gitlab-ci/rules.gitlab-ci.yml
+++ b/admin/gitlab-ci/rules.gitlab-ci.yml
@@ -73,13 +73,13 @@
 .rules-element:if-post-merge-acceptance-or-mr-then-always: &if-post-merge-acceptance-or-mr-then-always
   if: '$CI_PIPELINE_SOURCE == "merge_request_event" ||
        ($CI_PIPELINE_SOURCE == "push" &&
-        ($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME == "release-*"))'
+        $CI_COMMIT_REF_NAME == "master")'
   when: always
 
 # Include job only for post submit push
 .rules-element:if-post-merge-acceptance-then-always: &if-post-merge-acceptance-then-always
   if: '$CI_PIPELINE_SOURCE == "push" &&
-        ($CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME == "release-*")'
+       $CI_COMMIT_REF_NAME == "master"'
   when: always
 
 # When composing a rule set, note that the first matching rule is applied.