Skip to content

Commit f0c4c0a

Browse files
committed
Merge branch 'switch-pipeline-to-rules' into 'main'
Skip merge results pipeline See merge request ongresinc/stackgres!1650
2 parents 68e6787 + 305e857 commit f0c4c0a

8 files changed

Lines changed: 179 additions & 445 deletions

File tree

.gitlab-ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ include:
4242

4343
workflow:
4444
rules:
45-
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
46-
- if: $CI_PIPELINE_SOURCE == 'push'
47-
- if: $CI_PIPELINE_SOURCE == 'schedule'
48-
- if: $CI_PIPELINE_SOURCE == 'trigger'
49-
- if: $CI_COMMIT_TAG
45+
- if: |
46+
( ( $CI_PIPELINE_SOURCE =~ /^(push|schedule|trigger)$/ || $CI_COMMIT_TAG
47+
|| ( $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_SHA == null ) ) )

.gitlab-ci/build.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,8 @@ build arm64:
6464
- linux-arm64
6565
rules:
6666
- if: |
67-
( ( $CI_PIPELINE_SOURCE == 'merge_request_event'
68-
|| $CI_PIPELINE_SOURCE == 'push'
69-
|| $CI_PIPELINE_SOURCE == 'schedule'
70-
|| $CI_PIPELINE_SOURCE == 'trigger'
71-
|| $CI_COMMIT_TAG )
67+
( ( $CI_PIPELINE_SOURCE =~ /^(push|schedule|trigger)$/ || $CI_COMMIT_TAG
68+
|| ( $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_SHA == null ) )
7269
&& (
7370
( $SKIP_ARM != "true" && $CI_COMMIT_TAG )
7471
|| $DO_ARM ) )
@@ -106,11 +103,8 @@ build ui arm64:
106103
- linux-arm64
107104
rules:
108105
- if: |
109-
( ( $CI_PIPELINE_SOURCE == 'merge_request_event'
110-
|| $CI_PIPELINE_SOURCE == 'push'
111-
|| $CI_PIPELINE_SOURCE == 'schedule'
112-
|| $CI_PIPELINE_SOURCE == 'trigger'
113-
|| $CI_COMMIT_TAG )
106+
( ( $CI_PIPELINE_SOURCE =~ /^(push|schedule|trigger)$/ || $CI_COMMIT_TAG
107+
|| ( $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_SHA == null ) )
114108
&& (
115109
( $SKIP_ARM != "true" && $CI_COMMIT_TAG )
116110
|| $DO_ARM ) )

.gitlab-ci/deploy.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,8 @@
6161
retry: 2
6262
rules:
6363
- 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 ) )
6966
&& (
7067
( $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ )
7168
|| ( $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG )
@@ -110,11 +107,8 @@ deploy stream jvm image:
110107
IMAGE_PUSH_TAG_SUFFIX: ""
111108
rules:
112109
- 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 ) )
118112
&& (
119113
( $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ )
120114
|| ( $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $CI_COMMIT_TAG ) ) )
@@ -218,11 +212,8 @@ deploy helm packages and templates:
218212
aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths '/*'
219213
rules:
220214
- 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 ) )
226217
&& (
227218
( $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ )
228219
|| ( $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG )
@@ -251,11 +242,8 @@ pages:
251242
retry: 2
252243
rules:
253244
- 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 ) )
259247
&& (
260248
( $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ )
261249
|| ( $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG )

0 commit comments

Comments
 (0)