|
61 | 61 | retry: 2 |
62 | 62 | rules: |
63 | 63 | - if: | |
64 | | - ( ( $CI_PIPELINE_SOURCE == 'merge_request_event' |
65 | | - || $CI_PIPELINE_SOURCE == 'push' |
66 | | - || $CI_PIPELINE_SOURCE == 'schedule' |
67 | | - || $CI_PIPELINE_SOURCE == 'trigger' |
68 | | - || $CI_COMMIT_TAG ) |
| 64 | + ( ( $CI_PIPELINE_SOURCE =~ /^(push|schedule|trigger)$/ || $CI_COMMIT_TAG |
| 65 | + || ( $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_SHA == null ) ) |
69 | 66 | && ( |
70 | 67 | ( $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ ) |
71 | 68 | || ( $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG ) |
@@ -110,11 +107,8 @@ deploy stream jvm image: |
110 | 107 | IMAGE_PUSH_TAG_SUFFIX: "" |
111 | 108 | rules: |
112 | 109 | - if: | |
113 | | - ( ( $CI_PIPELINE_SOURCE == 'merge_request_event' |
114 | | - || $CI_PIPELINE_SOURCE == 'push' |
115 | | - || $CI_PIPELINE_SOURCE == 'schedule' |
116 | | - || $CI_PIPELINE_SOURCE == 'trigger' |
117 | | - || $CI_COMMIT_TAG ) |
| 110 | + ( ( $CI_PIPELINE_SOURCE =~ /^(push|schedule|trigger)$/ || $CI_COMMIT_TAG |
| 111 | + || ( $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_SHA == null ) ) |
118 | 112 | && ( |
119 | 113 | ( $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ ) |
120 | 114 | || ( $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $CI_COMMIT_TAG ) ) ) |
@@ -218,11 +212,8 @@ deploy helm packages and templates: |
218 | 212 | aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths '/*' |
219 | 213 | rules: |
220 | 214 | - if: | |
221 | | - ( ( $CI_PIPELINE_SOURCE == 'merge_request_event' |
222 | | - || $CI_PIPELINE_SOURCE == 'push' |
223 | | - || $CI_PIPELINE_SOURCE == 'schedule' |
224 | | - || $CI_PIPELINE_SOURCE == 'trigger' |
225 | | - || $CI_COMMIT_TAG ) |
| 215 | + ( ( $CI_PIPELINE_SOURCE =~ /^(push|schedule|trigger)$/ || $CI_COMMIT_TAG |
| 216 | + || ( $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_SHA == null ) ) |
226 | 217 | && ( |
227 | 218 | ( $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ ) |
228 | 219 | || ( $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG ) |
@@ -251,11 +242,8 @@ pages: |
251 | 242 | retry: 2 |
252 | 243 | rules: |
253 | 244 | - if: | |
254 | | - ( ( $CI_PIPELINE_SOURCE == 'merge_request_event' |
255 | | - || $CI_PIPELINE_SOURCE == 'push' |
256 | | - || $CI_PIPELINE_SOURCE == 'schedule' |
257 | | - || $CI_PIPELINE_SOURCE == 'trigger' |
258 | | - || $CI_COMMIT_TAG ) |
| 245 | + ( ( $CI_PIPELINE_SOURCE =~ /^(push|schedule|trigger)$/ || $CI_COMMIT_TAG |
| 246 | + || ( $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_SHA == null ) ) |
259 | 247 | && ( |
260 | 248 | ( $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ ) |
261 | 249 | || ( $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG ) |
|
0 commit comments