diff options
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d524c64..e4b739a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,8 +29,10 @@ stages: workflow: rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - if: $CI_PIPELINE_SOURCE == 'push' + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH variables: # The upstrem repository we will check for images diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 520144b..799e06d 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -29,8 +29,10 @@ stages: workflow: rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - if: $CI_PIPELINE_SOURCE == 'push' + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH variables: # The upstrem repository we will check for images |