summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-03-29 20:17:32 +0000
committerStan Hu <stanhu@gmail.com>2019-03-29 20:17:32 +0000
commit65f2ed1de20abbb31b18524004164f1de3de4194 (patch)
tree69be135f52c92176376705391ea0909e8f42cb6d
parent48438b7eb5c5083499934ceab595af1b345182a0 (diff)
parent23618d91b18fab21b62e38872d06fb7ef72b011e (diff)
downloadgitlab-ce-65f2ed1de20abbb31b18524004164f1de3de4194.tar.gz
Merge branch 'leipert-hotfix-ci-yml' into 'master'
Fix GitLab CI branch matching pattern See merge request gitlab-org/gitlab-ce!26777
-rw-r--r--.gitlab-ci.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7918fb6600..ab38c87039e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,8 +249,8 @@ package-and-qa:
- ./scripts/trigger-build omnibus
when: manual
only:
- - //@gitlab-org/gitlab-ce
- - //@gitlab-org/gitlab-ee
+ - /.+/@gitlab-org/gitlab-ce
+ - /.+/@gitlab-org/gitlab-ee
# Review docs base
.review-docs: &review-docs
@@ -685,10 +685,10 @@ gitlab:assets:compile:
- public/assets/
<<: *assets-compile-cache
only:
- - //@gitlab-org/gitlab-ce
- - //@gitlab-org/gitlab-ee
- - //@gitlab/gitlabhq
- - //@gitlab/gitlab-ee
+ - /.+/@gitlab-org/gitlab-ce
+ - /.+/@gitlab-org/gitlab-ee
+ - /.+/@gitlab/gitlabhq
+ - /.+/@gitlab/gitlab-ee
tags:
- docker
- gitlab-org
@@ -990,7 +990,7 @@ no_ee_check:
script:
- scripts/no-ee-check
only:
- - //@gitlab-org/gitlab-ce
+ - /.+/@gitlab-org/gitlab-ce
# GitLab Review apps
.review-build-cng-base: &review-build-cng-base