diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b76fc171a5..12057dea78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ workflow: rules: - if: $CI_MERGE_REQUEST_IID - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $GITLAB_USER_ID != "8866215" + - if: $CI_COMMIT_BRANCH # == $CI_DEFAULT_BRANCH && $GITLAB_USER_ID != "8866215" - if: $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ && $GITLAB_USER_ID != "8866215" include: diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml index 680f6c2646..f172c2667f 100644 --- a/.gitlab/CI/release.yml +++ b/.gitlab/CI/release.yml @@ -2,8 +2,6 @@ .optional-release: stage: check rules: - - if: $CI_PIPELINE_SOURCE != "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule" || ( $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $TAG_REGEX ) - when: never - when: manual allow_failure: true @@ -15,4 +13,4 @@ when: on_success - when: never retry: - max: 1 \ No newline at end of file + max: 1