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
b5d23d7c
Commit
b5d23d7c
authored
Feb 06, 2020
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use 'rules' in '.gitlab/ci/releases.gitlab-ci.yml'
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
f503bfec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
16 deletions
+13
-16
.gitlab-ci.yml
.gitlab-ci.yml
+0
-3
.gitlab/ci/releases.gitlab-ci.yml
.gitlab/ci/releases.gitlab-ci.yml
+13
-13
No files found.
.gitlab-ci.yml
View file @
b5d23d7c
...
@@ -24,9 +24,6 @@ variables:
...
@@ -24,9 +24,6 @@ variables:
ES_JAVA_OPTS
:
"
-Xms256m
-Xmx256m"
ES_JAVA_OPTS
:
"
-Xms256m
-Xmx256m"
ELASTIC_URL
:
"
http://elastic:changeme@elasticsearch:9200"
ELASTIC_URL
:
"
http://elastic:changeme@elasticsearch:9200"
after_script
:
-
date
include
:
include
:
-
local
:
.gitlab/ci/cache-repo.gitlab-ci.yml
-
local
:
.gitlab/ci/cache-repo.gitlab-ci.yml
-
local
:
.gitlab/ci/cng.gitlab-ci.yml
-
local
:
.gitlab/ci/cng.gitlab-ci.yml
...
...
.gitlab/ci/releases.gitlab-ci.yml
View file @
b5d23d7c
---
.releases:rules:canonical-dot-com-gitlab-stable-branch-only:
rules
:
-
if
:
'
$CI_SERVER_HOST
==
"gitlab.com"
&&
$CI_PROJECT_NAME
==
"gitlab-org/gitlab"
&&
$CI_COMMIT_REF_NAME
=~
/^[\d-]+-stable-ee$/'
.releases:rules:canonical-dot-com-security-gitlab-stable-branch-only:
rules
:
-
if
:
'
$CI_SERVER_HOST
==
"gitlab.com"
&&
$CI_PROJECT_NAME
==
"gitlab-org/security/gitlab"
&&
$CI_COMMIT_REF_NAME
=~
/^[\d-]+-stable-ee$/'
# Syncs any changes pushed to a stable branch to the corresponding
# Syncs any changes pushed to a stable branch to the corresponding
# gitlab-foss/CE stable branch. We run this prior to any tests so that random
# gitlab-foss/CE stable branch. We run this prior to any tests so that random
...
@@ -10,27 +16,21 @@
...
@@ -10,27 +16,21 @@
stage
:
sync
stage
:
sync
before_script
:
before_script
:
-
apk add --no-cache --update curl bash jq
-
apk add --no-cache --update curl bash jq
after_script
:
[]
script
:
script
:
-
bash scripts/sync-stable-branch.sh
-
bash scripts/sync-stable-branch.sh
only
:
variables
:
-
$CI_SERVER_HOST == "gitlab.com"
sync-stable-branch
:
sync-stable-branch
:
extends
:
.merge-train-sync
extends
:
-
.releases:rules:canonical-dot-com-gitlab-stable-branch-only
-
.merge-train-sync
variables
:
variables
:
SOURCE_PROJECT
:
gitlab-org/gitlab
SOURCE_PROJECT
:
gitlab-org/gitlab
TARGET_PROJECT
:
gitlab-org/gitlab-foss
TARGET_PROJECT
:
gitlab-org/gitlab-foss
only
:
refs
:
-
/^[\d-]+-stable-ee$/@gitlab-org/gitlab
sync-security-branch
:
sync-security-branch
:
extends
:
.merge-train-sync
extends
:
-
.releases:rules:canonical-dot-com-security-gitlab-stable-branch-only
-
.merge-train-sync
variables
:
variables
:
SOURCE_PROJECT
:
gitlab-org/security/gitlab
SOURCE_PROJECT
:
gitlab-org/security/gitlab
TARGET_PROJECT
:
gitlab-org/security/gitlab-foss
TARGET_PROJECT
:
gitlab-org/security/gitlab-foss
only
:
refs
:
-
/^[\d-]+-stable-ee$/@gitlab-org/security/gitlab
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