Commit 98d6db4b authored by Marcel Amirault's avatar Marcel Amirault Committed by Lin Jen-Shin

Update regex for docs branches in ci

Changes * to + to be more precise with acceptable branch names
parent ef19202c
...@@ -33,8 +33,8 @@ review-docs-deploy: ...@@ -33,8 +33,8 @@ review-docs-deploy:
- gem install gitlab --no-document - gem install gitlab --no-document
- ./$SCRIPT_NAME deploy - ./$SCRIPT_NAME deploy
only: only:
- /(^docs[\/-].*|.*-docs$)/@gitlab-org/gitlab-ce - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ce
- /(^docs[\/-].*|.*-docs$)/@gitlab-org/gitlab-ee - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ee
except: except:
- /(^qa[\/-].*|.*-qa$)/ - /(^qa[\/-].*|.*-qa$)/
......
...@@ -73,7 +73,7 @@ gitlab:assets:compile pull-cache: ...@@ -73,7 +73,7 @@ gitlab:assets:compile pull-cache:
refs: refs:
- master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee - master@gitlab-org/gitlab-ee
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].+|.+-docs$)/
.compile-assets-metadata: .compile-assets-metadata:
extends: .dedicated-runner extends: .dedicated-runner
...@@ -111,7 +111,7 @@ compile-assets pull-cache: ...@@ -111,7 +111,7 @@ compile-assets pull-cache:
refs: refs:
- master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee - master@gitlab-org/gitlab-ee
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].+|.+-docs$)/
karma: karma:
extends: .dedicated-no-docs-pull-cache-job extends: .dedicated-no-docs-pull-cache-job
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
.no-docs: .no-docs:
except: except:
refs: refs:
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].+|.+-docs$)/
.no-docs-and-no-qa: .no-docs-and-no-qa:
except: except:
refs: refs:
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].+|.+-docs$)/
- /(^qa[\/-].*|.*-qa$)/ - /(^qa[\/-].*|.*-qa$)/
.dedicated-no-docs-pull-cache-job: .dedicated-no-docs-pull-cache-job:
......
...@@ -207,7 +207,7 @@ downtime_check: ...@@ -207,7 +207,7 @@ downtime_check:
- master - master
- tags - tags
- /^[\d-]+-stable(-ee)?$/ - /^[\d-]+-stable(-ee)?$/
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].+|.+-docs$)/
- /(^qa[\/-].*|.*-qa$)/ - /(^qa[\/-].*|.*-qa$)/
dependencies: dependencies:
- setup-test-env - setup-test-env
...@@ -223,6 +223,7 @@ ee_compat_check: ...@@ -223,6 +223,7 @@ ee_compat_check:
- /^security-/ - /^security-/
- branches@gitlab-org/gitlab-ee - branches@gitlab-org/gitlab-ee
- branches@gitlab/gitlab-ee - branches@gitlab/gitlab-ee
- /(^docs[\/-].+|.+-docs$)/
retry: 0 retry: 0
artifacts: artifacts:
name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}" name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
except: except:
refs: refs:
- master - master
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].+|.+-docs$)/
.review-schedules-only: &review-schedules-only .review-schedules-only: &review-schedules-only
only: only:
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
except: except:
refs: refs:
- tags - tags
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].+|.+-docs$)/
.review-base: &review-base .review-base: &review-base
extends: .dedicated-runner extends: .dedicated-runner
......
...@@ -71,7 +71,7 @@ flaky-examples-check: ...@@ -71,7 +71,7 @@ flaky-examples-check:
except: except:
refs: refs:
- master - master
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].+|.+-docs$)/
- /(^qa[\/-].*|.*-qa$)/ - /(^qa[\/-].*|.*-qa$)/
artifacts: artifacts:
expire_in: 30d expire_in: 30d
......
...@@ -7,7 +7,7 @@ module Gitlab ...@@ -7,7 +7,7 @@ module Gitlab
CANONICAL_CE_PROJECT_URL = 'https://gitlab.com/gitlab-org/gitlab-ce'.freeze CANONICAL_CE_PROJECT_URL = 'https://gitlab.com/gitlab-org/gitlab-ce'.freeze
CANONICAL_EE_REPO_URL = 'https://gitlab.com/gitlab-org/gitlab-ee.git'.freeze CANONICAL_EE_REPO_URL = 'https://gitlab.com/gitlab-org/gitlab-ee.git'.freeze
CHECK_DIR = Rails.root.join('ee_compat_check') CHECK_DIR = Rails.root.join('ee_compat_check')
IGNORED_FILES_REGEX = /VERSION|CHANGELOG\.md/i.freeze IGNORED_FILES_REGEX = /VERSION|CHANGELOG\.md|doc\/.+/i.freeze
PLEASE_READ_THIS_BANNER = %Q{ PLEASE_READ_THIS_BANNER = %Q{
============================================================ ============================================================
===================== PLEASE READ THIS ===================== ===================== PLEASE READ THIS =====================
......
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