diff options
author | Stan Hu <stanhu@gmail.com> | 2019-03-29 20:17:32 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-03 16:02:14 +0000 |
commit | 4292486402affae3a8e8ef9845eb4202a4a36abf (patch) | |
tree | 04fe714cc4a2afaf93bbceb91f6b3008e2e949ae | |
parent | f621ab634872c31597d779d435abab424e08f2ab (diff) | |
download | gitlab-ce-4292486402affae3a8e8ef9845eb4202a4a36abf.tar.gz |
Merge branch 'leipert-hotfix-ci-yml' into 'master'
Fix GitLab CI branch matching pattern
See merge request gitlab-org/gitlab-ce!26777
(cherry picked from commit 65f2ed1de20abbb31b18524004164f1de3de4194)
23618d91 Fix GitLab CI branch matching pattern
-rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f33e47a7234..8ac10dfa7be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -244,8 +244,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 @@ -675,10 +675,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 @@ -997,7 +997,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 |