diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f58ca87..652b8dcc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,10 +46,8 @@ variables: #Link and Install all required dependencies workflow: rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS' - when: never - if: '$CI_COMMIT_BRANCH == "main"' + - if: '$CI_COMMIT_BRANCH =~ /^pr-[0-9]+$/' install: image: node:20-alpine @@ -153,10 +151,10 @@ test:live:setup: needs: [] timeout: 15m rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && '$CI_MERGE_REQUEST_ID' + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH when: on_success allow_failure: false - - if: ($CI_COMMIT_BRANCH == "next" || $CI_COMMIT_BRANCH =~ /^pr-[0-9]+$/) && '$CI_MERGE_REQUEST_ID' + - if: ($CI_COMMIT_BRANCH == "next" || $CI_COMMIT_BRANCH =~ /^pr-[0-9]+$/) when: manual allow_failure: true variables: