kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update regex for docs branches in ci

Browse source 
Changes * to + to be more precise with acceptable branch names
This commit is contained in:
Marcel Amirault 2019-08-02 06:24:07 +00:00 committed by Lin Jen-Shin
parent ef19202c16
commit 98d6db4b43
7 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab/ci/docs.gitlab-ci.yml
View file

@ -33,8 +33,8 @@ review-docs-deploy:
- gem install gitlab --no-document
- ./$SCRIPT_NAME deploy
only:
- /(^docs[\/-].*|.*-docs$)/@gitlab-org/gitlab-ce
- /(^docs[\/-].*|.*-docs$)/@gitlab-org/gitlab-ee
- /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ce
- /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ee
except:
- /(^qa[\/-].*|.*-qa$)/

4
.gitlab/ci/frontend.gitlab-ci.yml
View file

@ -73,7 +73,7 @@ gitlab:assets:compile pull-cache:
refs:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- /(^docs[\/-].*|.*-docs$)/
- /(^docs[\/-].+|.+-docs$)/
.compile-assets-metadata:
extends: .dedicated-runner
@ -111,7 +111,7 @@ compile-assets pull-cache:
refs:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- /(^docs[\/-].*|.*-docs$)/
- /(^docs[\/-].+|.+-docs$)/
karma:
extends: .dedicated-no-docs-pull-cache-job

4
.gitlab/ci/global.gitlab-ci.yml
View file

@ -31,12 +31,12 @@
.no-docs:
except:
refs:
- /(^docs[\/-].*|.*-docs$)/
- /(^docs[\/-].+|.+-docs$)/
.no-docs-and-no-qa:
except:
refs:
- /(^docs[\/-].*|.*-docs$)/
- /(^docs[\/-].+|.+-docs$)/
- /(^qa[\/-].*|.*-qa$)/
.dedicated-no-docs-pull-cache-job:

3
.gitlab/ci/rails.gitlab-ci.yml
View file

@ -207,7 +207,7 @@ downtime_check:
- master
- tags
- /^[\d-]+-stable(-ee)?$/
- /(^docs[\/-].*|.*-docs$)/
- /(^docs[\/-].+|.+-docs$)/
- /(^qa[\/-].*|.*-qa$)/
dependencies:
- setup-test-env
@ -223,6 +223,7 @@ ee_compat_check:
- /^security-/
- branches@gitlab-org/gitlab-ee
- branches@gitlab/gitlab-ee
- /(^docs[\/-].+|.+-docs$)/
retry: 0
artifacts:
name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"

4
.gitlab/ci/review.gitlab-ci.yml
View file

@ -7,7 +7,7 @@
except:
refs:
- master
- /(^docs[\/-].*|.*-docs$)/
- /(^docs[\/-].+|.+-docs$)/
.review-schedules-only: &review-schedules-only
only:
@ -20,7 +20,7 @@
except:
refs:
- tags
- /(^docs[\/-].*|.*-docs$)/
- /(^docs[\/-].+|.+-docs$)/
.review-base: &review-base
extends: .dedicated-runner

2
.gitlab/ci/test-metadata.gitlab-ci.yml
View file

@ -71,7 +71,7 @@ flaky-examples-check:
except:
refs:
- master
- /(^docs[\/-].*|.*-docs$)/
- /(^docs[\/-].+|.+-docs$)/
- /(^qa[\/-].*|.*-qa$)/
artifacts:
expire_in: 30d

2
lib/gitlab/ee_compat_check.rb
View file

@ -7,7 +7,7 @@ module Gitlab
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
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 =====================