summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-04-20 16:37:23 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-04-21 01:29:10 +0800
commit54232ad82cd1aabc1b04fb5a5d6a50e152660ea9 (patch)
tree562a0934affe64876149755421f1294a09e4be6f
parent87f5682b3b80c468f5d209ee76cdbe4781dc597d (diff)
downloadgitlab-ce-54232ad82cd1aabc1b04fb5a5d6a50e152660ea9.tar.gz
Merge branch 'no-downtime-check-stable' into 'master'
Don't run the downtime check on stable branches, or tags/master See merge request !10794
-rw-r--r--.gitlab-ci.yml8
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1fcdecde86f..2bfc7218918 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,7 +201,13 @@ rake config_lint: *exec
rake brakeman: *exec
rake flay: *exec
license_finder: *exec
-rake downtime_check: *exec
+rake downtime_check:
+ <<: *exec
+ except:
+ - master
+ - tags
+ - /^[\d-]+-stable(-ee)?$/
+
rake ee_compat_check:
<<: *exec
only: