Commit 65f2ed1d authored by Stan Hu's avatar Stan Hu

Merge branch 'leipert-hotfix-ci-yml' into 'master'

Fix GitLab CI branch matching pattern

See merge request gitlab-org/gitlab-ce!26777
parents 48438b7e 23618d91
...@@ -249,8 +249,8 @@ package-and-qa: ...@@ -249,8 +249,8 @@ package-and-qa:
- ./scripts/trigger-build omnibus - ./scripts/trigger-build omnibus
when: manual when: manual
only: only:
- //@gitlab-org/gitlab-ce - /.+/@gitlab-org/gitlab-ce
- //@gitlab-org/gitlab-ee - /.+/@gitlab-org/gitlab-ee
# Review docs base # Review docs base
.review-docs: &review-docs .review-docs: &review-docs
...@@ -685,10 +685,10 @@ gitlab:assets:compile: ...@@ -685,10 +685,10 @@ gitlab:assets:compile:
- public/assets/ - public/assets/
<<: *assets-compile-cache <<: *assets-compile-cache
only: only:
- //@gitlab-org/gitlab-ce - /.+/@gitlab-org/gitlab-ce
- //@gitlab-org/gitlab-ee - /.+/@gitlab-org/gitlab-ee
- //@gitlab/gitlabhq - /.+/@gitlab/gitlabhq
- //@gitlab/gitlab-ee - /.+/@gitlab/gitlab-ee
tags: tags:
- docker - docker
- gitlab-org - gitlab-org
...@@ -990,7 +990,7 @@ no_ee_check: ...@@ -990,7 +990,7 @@ no_ee_check:
script: script:
- scripts/no-ee-check - scripts/no-ee-check
only: only:
- //@gitlab-org/gitlab-ce - /.+/@gitlab-org/gitlab-ce
# GitLab Review apps # GitLab Review apps
.review-build-cng-base: &review-build-cng-base .review-build-cng-base: &review-build-cng-base
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment