summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-24 18:07:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-24 18:07:05 +0000
commitc4edbefa458319a81e238f8f034d19f6ea6292ca (patch)
treee09a53528a8ee7b0657ed80931c6e7ceff1eccc2 /.gitlab
parent8db8e2a34205c67e358cf544745d9eaeb30cd032 (diff)
downloadgitlab-ce-c4edbefa458319a81e238f8f034d19f6ea6292ca.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/releases.gitlab-ci.yml22
1 files changed, 22 insertions, 0 deletions
diff --git a/.gitlab/ci/releases.gitlab-ci.yml b/.gitlab/ci/releases.gitlab-ci.yml
new file mode 100644
index 00000000000..1ddc4e90fcf
--- /dev/null
+++ b/.gitlab/ci/releases.gitlab-ci.yml
@@ -0,0 +1,22 @@
+---
+
+# Syncs any changes pushed to a stable branch to the corresponding CE stable
+# branch. We run this prior to any tests so that random failures don't prevent a
+# sync.
+sync-stable-branch:
+ # We don't need/want any global before/after commands, so we overwrite these
+ # settings.
+ image: alpine:edge
+ stage: sync
+ # This job should only run on EE stable branches on the canonical GitLab.com
+ # repository.
+ only:
+ variables:
+ - $CI_SERVER_HOST == "gitlab.com"
+ refs:
+ - /^[\d-]+-stable-ee$/@gitlab-org/gitlab
+ before_script:
+ - apk add --no-cache --update curl bash
+ after_script: []
+ script:
+ - bash scripts/sync-stable-branch.sh