Skip to content

Commit 1656025

Browse files
committed
Merge branch 'workflow-ci-master' into 'master'
fix(engine,ui): change workflow to run pipeline for master branch See merge request postgres-ai/database-lab!493
2 parents 69d60de + ee2c889 commit 1656025

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ variables:
55
workflow:
66
rules:
77
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
8+
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
9+
- if: $CI_COMMIT_TAG
810
- if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
911
when: never
10-
- if: $CI_COMMIT_TAG
1112

1213
include:
1314
- local: 'engine/.gitlab-ci.yml'

engine/.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stages:
88
- integration-test
99
- deploy
1010

11-
## Conditions
11+
## Conditions.
1212
.only_engine: &only_engine
1313
rules:
1414
- if: $CI_COMMIT_TAG =~ /^v[a-zA-Z0-9_.-]*/

0 commit comments

Comments
 (0)