Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
98d6db4b
Commit
98d6db4b
authored
Aug 02, 2019
by
Marcel Amirault
Committed by
Lin Jen-Shin
Aug 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update regex for docs branches in ci
Changes * to + to be more precise with acceptable branch names
parent
ef19202c
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
11 deletions
+12
-11
.gitlab/ci/docs.gitlab-ci.yml
.gitlab/ci/docs.gitlab-ci.yml
+2
-2
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+2
-2
.gitlab/ci/global.gitlab-ci.yml
.gitlab/ci/global.gitlab-ci.yml
+2
-2
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+2
-1
.gitlab/ci/review.gitlab-ci.yml
.gitlab/ci/review.gitlab-ci.yml
+2
-2
.gitlab/ci/test-metadata.gitlab-ci.yml
.gitlab/ci/test-metadata.gitlab-ci.yml
+1
-1
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+1
-1
No files found.
.gitlab/ci/docs.gitlab-ci.yml
View file @
98d6db4b
...
@@ -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$)/
...
...
.gitlab/ci/frontend.gitlab-ci.yml
View file @
98d6db4b
...
@@ -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
...
...
.gitlab/ci/global.gitlab-ci.yml
View file @
98d6db4b
...
@@ -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
:
...
...
.gitlab/ci/rails.gitlab-ci.yml
View file @
98d6db4b
...
@@ -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}"
...
...
.gitlab/ci/review.gitlab-ci.yml
View file @
98d6db4b
...
@@ -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
...
...
.gitlab/ci/test-metadata.gitlab-ci.yml
View file @
98d6db4b
...
@@ -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
...
...
lib/gitlab/ee_compat_check.rb
View file @
98d6db4b
...
@@ -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 =====================
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment